summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-01-07Merge branch 'quilt/staging'Stephen Rothwell
2010-01-07Merge branch 'quilt/usb'Stephen Rothwell
2010-01-07Merge branch 'quilt/tty'Stephen Rothwell
2010-01-07Merge remote branch 'tip/auto-latest'Stephen Rothwell
2010-01-07Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-01-07Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-01-07Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: lib/Kconfig
2010-01-07Merge remote branch 'drbd/for-jens'Stephen Rothwell
2010-01-07Merge remote branch 'hwlat/for-linus'Stephen Rothwell
Conflicts: MAINTAINERS drivers/misc/Makefile
2010-01-07Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-01-07Merge remote branch 'bluetooth/master'Stephen Rothwell
2010-01-07Merge remote branch 'suspend/linux-next'Stephen Rothwell
Conflicts: drivers/input/serio/serio.c
2010-01-07Merge branch 'quilt/aoe'Stephen Rothwell
2010-01-07Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-01-07Merge remote branch 'osd/linux-next'Stephen Rothwell
2010-01-07Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2010-01-07Revert "drivers/char/agp/amd64-agp.c: squish warning"Stephen Rothwell
This reverts commit e85c5c6542528aba88a5d811652cf0e2d44f7f07.
2010-01-07Merge remote branch 'agp/agp-next'Stephen Rothwell
2010-01-07Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-01-07Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-01-07Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/asic3.c drivers/mfd/t7l66xb.c drivers/mfd/tc6387xb.c drivers/mfd/tc6393xb.c drivers/mfd/tmio_core.c drivers/mmc/host/tmio_mmc.c drivers/mmc/host/tmio_mmc.h include/linux/mfd/tmio.h
2010-01-07Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-01-07Merge remote branch 'battery/master'Stephen Rothwell
2010-01-07Merge remote branch 'pcmcia/master'Stephen Rothwell
2010-01-07Merge remote branch 'block/for-next'Stephen Rothwell
2010-01-07Merge remote branch 'input/next'Stephen Rothwell
2010-01-07Merge remote branch 'tmio-mmc/linux-next'Stephen Rothwell
2010-01-07Merge branch 'quilt/rr'Stephen Rothwell
2010-01-07Merge remote branch 'crypto/master'Stephen Rothwell
2010-01-07Merge remote branch 'mtd/master'Stephen Rothwell
2010-01-07Merge remote branch 'wireless/master'Stephen Rothwell
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h
2010-01-07Merge remote branch 'net/master'Stephen Rothwell
Conflicts: net/mac80211/iface.c net/mac80211/scan.c
2010-01-07Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-01-07Merge remote branch 'acpi/test'Stephen Rothwell
2010-01-07Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-01-07Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-01-07Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-01-07Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-01-07Merge branch 'quilt/i2c'Stephen Rothwell
2010-01-07Merge remote branch 'hid/for-next'Stephen Rothwell
2010-01-07Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-01-07Merge remote branch 'mips/mips-for-linux-next'Stephen Rothwell
2010-01-07Merge remote branch 'davinci/davinci-next'Stephen Rothwell
2010-01-07Merge remote branch 'arm/devel'Stephen Rothwell
2010-01-07Merge remote branch 'input-current/for-linus'Stephen Rothwell
2010-01-07Merge remote branch 'cpufreq-current/fixes'Stephen Rothwell
2010-01-07Merge branch 'quilt/staging.current'Stephen Rothwell
2010-01-07Merge branch 'quilt/usb.current'Stephen Rothwell
2010-01-07Merge branch 'quilt/tty.current'Stephen Rothwell
2010-01-07Merge remote branch 'wireless-current/master'Stephen Rothwell