summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-09-09Merge remote branch 'staging-next/staging-next'Stephen Rothwell
Conflicts: drivers/staging/Makefile drivers/staging/batman-adv/hard-interface.c drivers/staging/mrst-touchscreen/Makefile drivers/staging/mrst-touchscreen/intel-mid-touch.c
2010-09-09Merge branch 'quilt/usb'Stephen Rothwell
2010-09-09Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: drivers/serial/uartlite.c
2010-09-09Merge branch 'quilt/driver-core'Stephen Rothwell
2010-09-09Merge remote branch 'drivers-x86/linux-next'Stephen Rothwell
2010-09-09Merge remote branch 'oprofile/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'lost-spurious-irq/lost-spurious-irq'Stephen Rothwell
Conflicts: drivers/ata/libata-core.c include/linux/libata.h
2010-09-09Merge remote branch 'tip/auto-latest'Stephen Rothwell
2010-09-09Merge remote branch 'rcu/rcu/next'Stephen Rothwell
2010-09-09Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-09-09Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild
2010-09-09Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-09-09Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-09-09Merge branch 'quilt/aoe'Stephen Rothwell
2010-09-09Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'watchdog/master'Stephen Rothwell
2010-09-09Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-09-09Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-09-09Merge remote branch 'mfd/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'md/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-09-09Merge remote branch 'battery/master'Stephen Rothwell
2010-09-09Merge remote branch 'pcmcia/master'Stephen Rothwell
2010-09-09Merge remote branch 'block/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'input/next'Stephen Rothwell
2010-09-09Merge branch 'quilt/rr'Stephen Rothwell
2010-09-09Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-09-09Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c
2010-09-09Merge remote branch 'crypto/master'Stephen Rothwell
2010-09-09Merge remote branch 'wireless/master'Stephen Rothwell
2010-09-09Merge remote branch 'net/master'Stephen Rothwell
Conflicts: net/mac80211/main.c
2010-09-09Merge remote branch 'async_tx/next'Stephen Rothwell
2010-09-09Merge remote branch 'scsi/master'Stephen Rothwell
2010-09-09Merge remote branch 'kvm/linux-next'Stephen Rothwell
2010-09-09Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'idle-test/idle-test'Stephen Rothwell
2010-09-09Merge remote branch 'acpi/test'Stephen Rothwell
2010-09-09Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-09-09Merge remote branch 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/IR/ir-keytable.c drivers/media/IR/ir-lirc-codec.c drivers/media/IR/ir-raw-event.c drivers/media/IR/streamzap.c drivers/media/dvb/siano/smscoreapi.c drivers/media/video/s5p-fimc/fimc-core.c
2010-09-09Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-09-09Merge branch 'quilt/i2c'Stephen Rothwell
2010-09-09Merge remote branch 'hid/for-next'Stephen Rothwell
2010-09-09Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-09-09Merge remote branch 'sh/master'Stephen Rothwell
2010-09-09Merge remote branch 's390/features'Stephen Rothwell
2010-09-09Merge remote branch 'powerpc/next'Stephen Rothwell
2010-09-09Merge remote branch 'microblaze/next'Stephen Rothwell
2010-09-09Merge remote branch 'm68knommu/for-next'Stephen Rothwell