summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-05-25Add linux-next specific files for 20090525next-20090525Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-05-25Merge commit 'scsi-post-merge/master'Stephen Rothwell
Conflicts: include/Kbuild
2009-05-25Revert "V4L/DVB (11673): v4l2-device: unregister i2c_clients when ↵Stephen Rothwell
unregistering the v4l2_device." This reverts commit d5bc7940d39649210f1affac1fa32f253cc45a81.
2009-05-25Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/rt2860/common/mlme.c drivers/staging/rt2870/common/mlme.c drivers/staging/rt3070/common/mlme.c
2009-05-25Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/usb/serial/sierra.c
2009-05-25Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: init/main.c
2009-05-25Merge commit 'asm-generic/next'Stephen Rothwell
2009-05-25Merge commit 'fsnotify/for-next'Stephen Rothwell
2009-05-25Merge commit 'edac-amd/for-next'Stephen Rothwell
2009-05-25Merge commit 'bluetooth/master'Stephen Rothwell
2009-05-25Merge commit 'suspend/linux-next'Stephen Rothwell
2009-05-25Merge commit 'kmemleak/kmemleak'Stephen Rothwell
Conflicts: arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S lib/Kconfig.debug mm/slob.c
2009-05-25Merge commit 'omap/for-next'Stephen Rothwell
2009-05-25Merge commit 'trivial/for-next'Stephen Rothwell
2009-05-25Merge commit 'jc_docs/docs-next'Stephen Rothwell
2009-05-25Merge commit 'osd/linux-next'Stephen Rothwell
2009-05-25Merge commit 'cputime/cputime'Stephen Rothwell
2009-05-25Merge commit 'dwmw2-iommu/master'Stephen Rothwell
Conflicts: drivers/pci/intel-iommu.c drivers/pci/intr_remapping.c
2009-05-25Merge commit 'watchdog/master'Stephen Rothwell
2009-05-25Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
2009-05-25Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
2009-05-25Merge commit 'oprofile/auto-oprofile-next'Stephen Rothwell
2009-05-25Merge commit 'timers/auto-timers-next'Stephen Rothwell
2009-05-25Merge commit 'sched/auto-sched-next'Stephen Rothwell
2009-05-25Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2009-05-25Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c
2009-05-25Merge commit 'tracing/auto-tracing-next'Stephen Rothwell
Conflicts: block/blk-sysfs.c net/core/drop_monitor.c net/core/net-traces.c
2009-05-25Merge commit 'tip-core/auto-core-next'Stephen Rothwell
2009-05-25Merge branch 'quilt/ttydev'Stephen Rothwell
2009-05-25Merge commit 'security-testing/next'Stephen Rothwell
2009-05-25Merge commit 'voltage/for-next'Stephen Rothwell
2009-05-25Merge commit 'mfd/for-next'Stephen Rothwell
2009-05-25Merge commit 'md/for-next'Stephen Rothwell
2009-05-25Merge commit 'slab/for-next'Stephen Rothwell
2009-05-25Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-05-25Merge commit 'firmware/master'Stephen Rothwell
2009-05-25Merge commit 'block/for-next'Stephen Rothwell
Conflicts: drivers/ide/ide-atapi.c drivers/ide/ide-cd.c drivers/ide/ide-floppy.c drivers/ide/ide-tape.c
2009-05-25Merge commit 'input/next'Stephen Rothwell
2009-05-25Merge commit 'mmc/next'Stephen Rothwell
2009-05-25Merge branch 'quilt/rr'Stephen Rothwell
2009-05-25Merge commit 'sound/for-next'Stephen Rothwell
2009-05-25Merge commit 'crypto/master'Stephen Rothwell
2009-05-25Revert "rfkill: remove user_claim stuff"Stephen Rothwell
This reverts commit 621cac85297de5ba655e3430b007dd2e0da91da6.
2009-05-25Merge commit 'wireless/master'Stephen Rothwell
2009-05-25Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/net/wireless/iwlwifi/iwl-agn.c drivers/net/wireless/iwlwifi/iwl3945-base.c include/linux/mmc/sdio_ids.h
2009-05-25Merge commit 'scsi/master'Stephen Rothwell
2009-05-25Merge commit 'dlm/next'Stephen Rothwell
2009-05-25Merge commit 'kvm/master'Stephen Rothwell
2009-05-25Merge commit 'ubi/linux-next'Stephen Rothwell
2009-05-25Merge commit 'ieee1394/for-next'Stephen Rothwell