summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-05-26Merge commit 'cifs/master'Stephen Rothwell
2008-05-26Merge branch 'quilt/rr'Stephen Rothwell
2008-05-26Merge commit 'cpufreq/next'Stephen Rothwell
2008-05-26Merge commit 'arm/devel'Stephen Rothwell
2008-05-26Merge commit 'sound/master'Stephen Rothwell
2008-05-26Merge commit 'vfs/vfs-2.6.25'Stephen Rothwell
2008-05-26Merge commit 'crypto/master'Stephen Rothwell
2008-05-26Merge commit 'wireless/master'Stephen Rothwell
Conflicts: drivers/net/wireless/libertas/main.c
2008-05-26Merge commit 'mtd/master'Stephen Rothwell
2008-05-26Merge commit 'galak/powerpc-next'Stephen Rothwell
2008-05-26Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/net/cpmac.c net/mac80211/mlme.c
2008-05-26Merge commit 'async_tx/next'Stephen Rothwell
2008-05-26Merge commit '4xx/next'Stephen Rothwell
2008-05-26Merge commit 'ext4/next'Stephen Rothwell
2008-05-26Merge commit 'powerpc/powerpc-next'Stephen Rothwell
2008-05-26Merge branch 'quilt/m68k'Stephen Rothwell
2008-05-26Merge commit 'selinux/for-akpm'Stephen Rothwell
2008-05-26Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-05-26Merge commit 'tests/master'Stephen Rothwell
Conflicts: lib/Kconfig.debug
2008-05-26Merge commit 'scsi/master'Stephen Rothwell
2008-05-26Merge commit 'kvm/master'Stephen Rothwell
2008-05-26Merge commit 'ubi/master'Stephen Rothwell
2008-05-26Merge commit 'hwmon/testing'Stephen Rothwell
2008-05-26Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-05-26Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2008-05-26Merge commit 'acpi/test'Stephen Rothwell
2008-05-26Merge commit 'infiniband/for-next'Stephen Rothwell
2008-05-26Merge commit 'xfs/master'Stephen Rothwell
2008-05-26Merge branch 'quilt/ide'Stephen Rothwell
2008-05-26Merge commit 'jfs/next'Stephen Rothwell
2008-05-26Merge commit 'sh/master'Stephen Rothwell
2008-05-26Merge commit 's390/features'Stephen Rothwell
2008-05-26Merge commit 'v4l-dvb/stable'Stephen Rothwell
2008-05-26Merge commit 'avr32/avr32-arch'Stephen Rothwell
2008-05-26Merge branch 'quilt/kernel-doc'Stephen Rothwell
2008-05-26Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2008-05-26Merge commit 'hid/mm'Stephen Rothwell
2008-05-26Merge commit 'pci/linux-next'Stephen Rothwell
2008-05-26Merge commit 'sched/auto-sched-next'Stephen Rothwell
2008-05-26Merge commit 'x86/auto-x86-next'Stephen Rothwell
2008-05-26Merge branch 'quilt/usb'Stephen Rothwell
2008-05-26Merge branch 'quilt/driver-core'Stephen Rothwell
2008-05-26Merge commit 'input-current/for-linus'Stephen Rothwell
2008-05-26Merge branch 'quilt/usb.current'Stephen Rothwell
2008-05-26Merge branch 'quilt/driver-core.current'Stephen Rothwell
2008-05-26Merge commit 'pci-current/for-linus'Stephen Rothwell
2008-05-26Merge commit 'net-current/master'Stephen Rothwell
2008-05-26Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
2008-05-26misc:down_nowait-kernel_printkRusty Russell
down_trylock -> down_try in kernel/printk.c Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2008-05-26misc:down_nowait-xfsRusty Russell
down_trylock -> down_try in xfs Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: xfs@oss.sgi.com