summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-05-14Merge commit 'jc_docs/docs-next'Stephen Rothwell
2009-05-14Merge commit 'dwmw2-iommu/master'Stephen Rothwell
Conflicts: drivers/pci/intel-iommu.c drivers/pci/intr_remapping.c
2009-05-14Merge commit 'watchdog/master'Stephen Rothwell
2009-05-14Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
2009-05-14Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
2009-05-14Merge commit 'oprofile/auto-oprofile-next'Stephen Rothwell
2009-05-14Merge branch 'quilt/ttydev'Stephen Rothwell
2009-05-14Merge commit 'security-testing/next'Stephen Rothwell
2009-05-14Merge commit 'voltage/for-next'Stephen Rothwell
2009-05-14Merge commit 'mfd/for-next'Stephen Rothwell
2009-05-14Merge commit 'slab/for-next'Stephen Rothwell
2009-05-14Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-05-14Merge commit 'firmware/master'Stephen Rothwell
2009-05-14scsi/block: fixup scsi_transport_fc for block changesStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-05-14Revert "block: move completion related functions back to blk-core.c"Stephen Rothwell
This reverts commit b1f744937f1be3e6d3009382a755679133cf782d.
2009-05-14Merge commit 'block/for-next'Stephen Rothwell
Conflicts: drivers/block/hd.c drivers/block/mg_disk.c drivers/ide/ide-atapi.c drivers/ide/ide-cd.c drivers/ide/ide-floppy.c drivers/ide/ide-tape.c
2009-05-14Merge commit 'input/next'Stephen Rothwell
2009-05-14Merge commit 'mmc/next'Stephen Rothwell
2009-05-14Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
2009-05-14Merge commit 'sound/for-next'Stephen Rothwell
2009-05-14Merge commit 'vfs/for-next'Stephen Rothwell
Conflicts: fs/ext4/super.c fs/fuse/inode.c
2009-05-14Merge commit 'crypto/master'Stephen Rothwell
2009-05-14Revert "rfkill: remove user_claim stuff"Stephen Rothwell
This reverts commit 621cac85297de5ba655e3430b007dd2e0da91da6.
2009-05-14Merge commit 'wireless/master'Stephen Rothwell
2009-05-14Merge commit 'net/master'Stephen Rothwell
Conflicts: include/linux/mmc/sdio_ids.h
2009-05-14Merge commit 'scsi/master'Stephen Rothwell
Conflicts: include/Kbuild
2009-05-14Merge commit 'dlm/next'Stephen Rothwell
2009-05-14Merge commit 'kvm/master'Stephen Rothwell
Conflicts: arch/x86/kvm/x86.c
2009-05-14Merge commit 'acpi/test'Stephen Rothwell
2009-05-14Merge commit 'infiniband/for-next'Stephen Rothwell
2009-05-14Merge commit 'libata/NEXT'Stephen Rothwell
2009-05-14Merge commit 'ide/for-next'Stephen Rothwell
2009-05-14Revert "initconst adjustments"Stephen Rothwell
This reverts commit efbe795f5f63b74ed642e196518907355aa94bd7.
2009-05-14Merge commit 'kbuild/master'Stephen Rothwell
2009-05-14Merge commit 'v4l-dvb/master'Stephen Rothwell
2009-05-14Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-05-14Merge branch 'quilt/i2c'Stephen Rothwell
2009-05-14Merge commit 'hid/for-next'Stephen Rothwell
2009-05-14Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-05-14Merge commit 'pci/linux-next'Stephen Rothwell
2009-05-14Merge commit 'timers/auto-timers-next'Stephen Rothwell
2009-05-14Merge commit 'sched/auto-sched-next'Stephen Rothwell
2009-05-14Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2009-05-14Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2009-05-14Merge commit 'tracing/auto-tracing-next'Stephen Rothwell
2009-05-14Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2009-05-14Merge commit 'xfs/master'Stephen Rothwell
2009-05-14Merge commit 'ubifs/linux-next'Stephen Rothwell
2009-05-14Merge commit 'v9fs/for-next'Stephen Rothwell
Conflicts: net/9p/protocol.c
2009-05-14Merge commit 'ocfs2/linux-next'Stephen Rothwell