summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-12-09Merge remote branch 'cleancache/linux-next'Stephen Rothwell
Conflicts: fs/ocfs2/super.c include/linux/fs.h mm/Kconfig
2010-12-09Merge remote branch 'bkl-config/config'Stephen Rothwell
Conflicts: arch/powerpc/kernel/setup_64.c include/linux/hardirq.h include/linux/smp_lock.h
2010-12-09Merge remote branch 'staging/staging-next'Stephen Rothwell
2010-12-09Merge remote branch 'usb/usb-next'Stephen Rothwell
Conflicts: arch/sh/Kconfig drivers/usb/musb/blackfin.c
2010-12-09Merge remote branch 'tty/tty-next'Stephen Rothwell
2010-12-09Merge remote branch 'driver-core/driver-core-next'Stephen Rothwell
2010-12-09Merge remote branch 'drivers-x86/linux-next'Stephen Rothwell
2010-12-09Merge remote branch 'percpu/for-next'Stephen Rothwell
2010-12-09Merge remote branch 'edac-amd/for-next'Stephen Rothwell
2010-12-09Merge remote branch 'xen/upstream/xen'Stephen Rothwell
2010-12-09Revert "x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog"Stephen Rothwell
This reverts commit 072b198a4ad48bd722ec6d203d65422a4698eae7. Conflicts: arch/x86/kernel/smpboot.c
2010-12-09Merge remote branch 'tip/auto-latest'Stephen Rothwell
2010-12-09Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-12-09Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: drivers/Makefile include/linux/Kbuild lib/Kconfig
2010-12-09Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-12-09Merge remote branch 'trivial/for-next'Stephen Rothwell
Conflicts: MAINTAINERS drivers/scsi/bfa/bfa_fcpim.c
2010-12-09Merge remote branch 'watchdog/master'Stephen Rothwell
2010-12-09Merge remote branch 'security-testing/next'Stephen Rothwell
2010-12-09Merge remote branch 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/regulator/core.c
2010-12-09Merge remote branch 'fbdev/master'Stephen Rothwell
2010-12-09Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-12-09Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/wm8994-core.c
2010-12-09Merge remote branch 'mmc/mmc-next'Stephen Rothwell
2010-12-09Merge remote branch 'battery/master'Stephen Rothwell
2010-12-09Merge remote branch 'input/next'Stephen Rothwell
2010-12-09Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-12-09Merge remote branch 'sound/for-next'Stephen Rothwell
Conflicts: sound/soc/sh/fsi.c
2010-12-09Merge remote branch 'crypto/master'Stephen Rothwell
2010-12-09Merge remote branch 'mtd/master'Stephen Rothwell
2010-12-09Merge commit 'refs/next/20101208/net'Stephen Rothwell
2010-12-09Merge remote branch 'wireless/master'Stephen Rothwell
2010-12-09Merge remote branch 'async_tx/next'Stephen Rothwell
2010-12-09Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-12-09Merge remote branch 'idle-test/idle-test'Stephen Rothwell
2010-12-09Merge commit 'refs/next/20101201/acpi'Stephen Rothwell
2010-12-09Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-12-09Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-12-09Merge remote branch 'hwmon-staging/hwmon-next'Stephen Rothwell
2010-12-09Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-12-09Merge remote branch 'bjdooks-i2c/next-i2c'Stephen Rothwell
2010-12-09Merge branch 'quilt/i2c'Stephen Rothwell
2010-12-09Merge remote branch 'hid/for-next'Stephen Rothwell
2010-12-09Merge remote branch 'pci/linux-next'Stephen Rothwell
Conflicts: drivers/pci/pci-sysfs.c
2010-12-09Merge remote branch 'rmobile/rmobile-latest'Stephen Rothwell
Conflicts: arch/arm/mach-shmobile/Kconfig
2010-12-09Merge remote branch 's390/features'Stephen Rothwell
2010-12-09Merge remote branch 'powerpc/next'Stephen Rothwell
2010-12-09Merge remote branch 'blackfin/for-linus'Stephen Rothwell
2010-12-09Merge remote branch 'omap/for-next'Stephen Rothwell
2010-12-09Merge remote branch 'i.MX/for-next'Stephen Rothwell
2010-12-09Merge remote branch 'arm/devel'Stephen Rothwell