summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-07-30Add linux-next specific files for 20090730next-20090730Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-07-30Revert "[SCSI] libsas: fix wide port hotplug issues"Stephen Rothwell
This reverts commit 4c70d933a41e1d712f3db90d2a41141730383d5a.
2009-07-30Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/epl/VirtualEthernetLinux.c
2009-07-30Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/usb/gadget/m66592-udc.c drivers/usb/host/r8a66597-hcd.c
2009-07-30Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: init/main.c
2009-07-30Merge commit 'asm-generic/next'Stephen Rothwell
2009-07-30Merge commit 'sfi/sfi-test'Stephen Rothwell
2009-07-30Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/sh/kernel/vmlinux.lds.S arch/x86/kernel/cpu/perf_counter.c drivers/cpufreq/cpufreq_ondemand.c
2009-07-30Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: drivers/oprofile/oprofile_stats.c include/linux/rcupdate.h
2009-07-30Merge commit 'drbd/drbd'Stephen Rothwell
2009-07-30Merge commit 'hwlat/for-linus'Stephen Rothwell
2009-07-30Merge commit 'fsnotify/for-next'Stephen Rothwell
2009-07-30Merge commit 'edac-amd/for-next'Stephen Rothwell
Conflicts: include/linux/topology.h
2009-07-30Merge commit 'bluetooth/master'Stephen Rothwell
2009-07-30Merge commit 'suspend/linux-next'Stephen Rothwell
2009-07-30Merge commit 'trivial/for-next'Stephen Rothwell
2009-07-30Merge commit 'jc_docs/docs-next'Stephen Rothwell
2009-07-30Merge commit 'cputime/cputime'Stephen Rothwell
2009-07-30Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-07-30Merge commit 'watchdog/master'Stephen Rothwell
2009-07-30Merge commit 'security-testing/next'Stephen Rothwell
2009-07-30Merge commit 'voltage/for-next'Stephen Rothwell
2009-07-30Merge commit 'drm/drm-next'Stephen Rothwell
2009-07-30Merge commit 'mfd/for-next'Stephen Rothwell
2009-07-30Merge commit 'slab/for-next'Stephen Rothwell
2009-07-30Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-07-30Merge commit 'battery/master'Stephen Rothwell
2009-07-30Merge commit 'block/for-next'Stephen Rothwell
2009-07-30Merge commit 'input/next'Stephen Rothwell
2009-07-30Merge branch 'quilt/rr'Stephen Rothwell
2009-07-30Merge commit 'cpufreq/next'Stephen Rothwell
2009-07-30Merge commit 'sound/for-next'Stephen Rothwell
2009-07-30Merge commit 'crypto/master'Stephen Rothwell
2009-07-30Merge commit 'wireless/master'Stephen Rothwell
2009-07-30Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/net/wireless/iwlwifi/iwl-3945.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c
2009-07-30Merge commit 'udf/for_next'Stephen Rothwell
2009-07-30Merge commit 'async_tx/next'Stephen Rothwell
2009-07-30Merge commit 'scsi/master'Stephen Rothwell
2009-07-30Merge commit 'kvm/master'Stephen Rothwell
2009-07-30Merge commit 'ubi/linux-next'Stephen Rothwell
2009-07-30Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-07-30Merge commit 'acpi/test'Stephen Rothwell
2009-07-30Merge commit 'infiniband/for-next'Stephen Rothwell
2009-07-30Merge commit 'libata/NEXT'Stephen Rothwell
2009-07-30Merge commit 'kbuild/master'Stephen Rothwell
2009-07-30Merge commit 'quota/for_next'Stephen Rothwell
2009-07-30Merge commit 'v4l-dvb/master'Stephen Rothwell
Conflicts: arch/arm/mach-davinci/board-dm646x-evm.c arch/arm/mach-davinci/dm355.c arch/arm/mach-davinci/dm644x.c arch/arm/mach-davinci/dm646x.c arch/arm/mach-davinci/include/mach/dm355.h arch/arm/mach-davinci/include/mach/dm644x.h drivers/media/dvb/b2c2/flexcop-fe-tuner.c
2009-07-30Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2009-07-30Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/chips/tsl2550.c
2009-07-30Merge commit 'hid/for-next'Stephen Rothwell