summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2008-10-16mfd/wm8350: don't export static functionsStephen Rothwell
Today's linux-next build (powerpc allyesconfig) failed like this: drivers/mfd/wm8350-core.c:1131: error: __ksymtab_wm8350_create_cache causes a section type conflict Caused by commit 89b4012befb1abca5e86d232bc0e2a797b0d9825 ("mfd: Core support for the WM8350 AudioPlus PMIC"). wm8350_create_cache is not used elsewhere, so remove the EXPORT_SYMBOL. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-16tpm: don't export static functionsStephen Rothwell
Today's linux-next build (powerpc_allyesconfig) failed like this: drivers/char/tpm/tpm.c:1162: error: __ksymtab_tpm_dev_release causes a section type conflict Caused by commit 253115b71fa06330bd58afbe01ccaf763a8a0cf1 ("The tpm_dev_release function is only called for platform devices, not pnp") which exported a static function. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-16sparc: qlogicpti fallout from sbus removalStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2008-10-16Merge commit 'watchdog/master'Stephen Rothwell
2008-10-16Merge commit 'uwb/for-upstream'Stephen Rothwell
Conflicts: Documentation/ABI/testing/sysfs-bus-usb
2008-10-16Merge commit 'fastboot/auto-fastboot-next'Stephen Rothwell
Conflicts: drivers/md/Kconfig include/linux/init.h init/main.c scripts/bootgraph.pl
2008-10-16Merge commit 'creds/next-creds-subsys'Stephen Rothwell
Conflicts: fs/namespace.c fs/nfsd/nfs4recover.c include/linux/sched.h kernel/exit.c kernel/fork.c kernel/signal.c net/9p/client.c security/selinux/hooks.c
2008-10-16Merge branch 'quilt/ttydev'Stephen Rothwell
2008-10-16Merge commit 'voltage/for-linus'Stephen Rothwell
2008-10-16Merge commit 'drm/drm-next'Stephen Rothwell
2008-10-16Merge commit 'hdlc/hdlc-next'Stephen Rothwell
2008-10-16Merge commit 'mfd/for-next'Stephen Rothwell
2008-10-16Merge commit 'md/for-next'Stephen Rothwell
Conflicts: drivers/md/md.c
2008-10-16Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2008-10-16Merge commit 'backlight/for-mm'Stephen Rothwell
2008-10-16Merge commit 'leds/for-mm'Stephen Rothwell
2008-10-16Merge commit 'battery/master'Stephen Rothwell
Conflicts: drivers/power/Makefile
2008-10-16Merge commit 'firmware/master'Stephen Rothwell
Conflicts: drivers/scsi/qlogicpti.c firmware/WHENCE
2008-10-16Merge commit 'trivial/next'Stephen Rothwell
Conflicts: Documentation/edac.txt include/linux/securebits.h
2008-10-16md: fix input truncation in safe_delay_store()Dan Williams
safe_delay_store() currently truncates the last character of input since it tells strlcpy that the buffer can only hold 'len' characters, off by one. sysfs already null terminates the buffer, so just increase the last argument to strlcpy. Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
2008-10-16Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
2008-10-16Merge commit 'semaphore-removal/semaphore-removal'Stephen Rothwell
Conflicts: net/9p/trans_virtio.c
2008-10-16Merge commit 'input/next'Stephen Rothwell
Conflicts: Documentation/kernel-parameters.txt
2008-10-16Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: kernel/module.c
2008-10-16Merge commit 'vfs/for-next'Stephen Rothwell
Conflicts: fs/ext4/namei.c
2008-10-16Merge commit 'crypto/master'Stephen Rothwell
2008-10-16Merge commit 'mtd/master'Stephen Rothwell
2008-10-16Merge commit 'async_tx/next'Stephen Rothwell
2008-10-16Merge commit 'scsi/master'Stephen Rothwell
2008-10-16Merge commit 'kvm/master'Stephen Rothwell
Conflicts: arch/x86/kvm/i8254.c
2008-10-16Merge commit 'ubi/linux-next'Stephen Rothwell
2008-10-16Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-10-16Merge commit 'acpi/test'Stephen Rothwell
Conflicts: MAINTAINERS drivers/acpi/Kconfig drivers/acpi/scan.c drivers/pnp/Makefile
2008-10-16Merge commit 'infiniband/for-next'Stephen Rothwell
2008-10-16Merge branch 'quilt/ide'Stephen Rothwell
2008-10-16Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2008-10-16Merge branch 'quilt/i2c'Stephen Rothwell
2008-10-16Merge branch 'quilt/device-mapper'Stephen Rothwell
2008-10-16Merge commit 'pci/linux-next'Stephen Rothwell
Conflicts: drivers/pci/pcie/aspm.c
2008-10-16md: check for memory allocation failure in faulty personalitySven Wegener
It's a fault injection module, but I don't think we should oops here. Signed-off-by: Sven Wegener <sven.wegener@stealer.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Neil Brown <neilb@suse.de>
2008-10-16Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-10-16Merge commit 'tip-core/auto-core-next'Stephen Rothwell
Conflicts: arch/powerpc/include/asm/types.h arch/powerpc/platforms/Kconfig.cputype
2008-10-16Revert "USB: ohci: add support for tmio-ohci cell"Stephen Rothwell
This reverts commit 4fa35b11a2af4c941f87657d34bbfb895cc4db09.
2008-10-16Merge branch 'quilt/usb'Stephen Rothwell
2008-10-16Merge branch 'quilt/driver-core'Stephen Rothwell
2008-10-16Merge commit 'x86/auto-x86-next'Stephen Rothwell
2008-10-16Merge commit 'sh/master'Stephen Rothwell
2008-10-16Merge commit 's390/features'Stephen Rothwell
2008-10-16Merge commit 'parisc/master'Stephen Rothwell
Conflicts:
2008-10-16Merge branch 'quilt/m68k'Stephen Rothwell
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 12:23:36 +0000