summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-07-15Merge remote branch 'drivers-x86/linux-next'Stephen Rothwell
2010-07-15Merge remote branch 'edac-amd/for-next'Stephen Rothwell
2010-07-15Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: Makefile
2010-07-15Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-07-15Merge remote branch 'alacrity/linux-next'Stephen Rothwell
2010-07-15Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-07-15Merge remote branch 'bluetooth/master'Stephen Rothwell
2010-07-15Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-07-15Merge branch 'quilt/aoe'Stephen Rothwell
2010-07-15Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-07-15Merge remote branch 'watchdog/master'Stephen Rothwell
2010-07-15Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-07-15Merge remote branch 'security-testing/next'Stephen Rothwell
2010-07-15Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-07-15Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-07-15Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-07-15Merge remote branch 'mfd/for-next'Stephen Rothwell
2010-07-15Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-07-15Merge remote branch 'battery/master'Stephen Rothwell
2010-07-15Merge remote branch 'pcmcia/master'Stephen Rothwell
2010-07-15Merge branch 'quilt/device-mapper'Stephen Rothwell
Conflicts: drivers/md/dm.c
2010-07-15Merge remote branch 'block/for-next'Stephen Rothwell
Conflicts: drivers/block/virtio_blk.c
2010-07-15Merge remote branch 'input/next'Stephen Rothwell
2010-07-15Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/um/drivers/hostaudio_kern.c kernel/module.c
2010-07-15Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-07-15Merge remote branch 'sound/for-next'Stephen Rothwell
Conflicts: Documentation/kernel-parameters.txt
2010-07-15Merge remote branch 'crypto/master'Stephen Rothwell
2010-07-15Merge remote branch 'mtd/master'Stephen Rothwell
2010-07-15Merge remote branch 'wireless/master'Stephen Rothwell
2010-07-15Merge remote branch 'net/master'Stephen Rothwell
2010-07-15Merge remote branch 'async_tx/next'Stephen Rothwell
2010-07-15Merge remote branch 'scsi/master'Stephen Rothwell
2010-07-15Merge remote branch 'ibft/master'Stephen Rothwell
2010-07-15Merge remote branch 'ubi/linux-next'Stephen Rothwell
2010-07-15Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-07-15Merge remote branch 'acpi/test'Stephen Rothwell
2010-07-15Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-07-15Merge remote branch 'ide/master'Stephen Rothwell
2010-07-15Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-07-15Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-07-15Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: drivers/i2c/i2c-core.c
2010-07-15Merge remote branch 'hid/for-next'Stephen Rothwell
2010-07-15Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-07-15Revert "Make ->drop_inode() just return whether inode needs to be dropped"Stephen Rothwell
This reverts commit c0ae81f2ffbc10a128699ad0662c63f9bfed8835.
2010-07-15Merge remote branch 'vfs/for-next'Stephen Rothwell
Conflicts: fs/nilfs2/super.c fs/xfs/linux-2.6/xfs_super.c
2010-07-15Merge remote branch 'tile/master'Stephen Rothwell
2010-07-15Merge remote branch 'genesis/master'Stephen Rothwell
Conflicts: arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig arch/arm/configs/g4evm_defconfig
2010-07-15Merge remote branch 'sh/master'Stephen Rothwell
2010-07-15Merge remote branch 's390/features'Stephen Rothwell
2010-07-15Merge remote branch '52xx-and-virtex/next'Stephen Rothwell
Conflicts: drivers/serial/mpc52xx_uart.c