summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-10-07Merge remote branch 'rcu/rcu/next'Stephen Rothwell
Conflicts: include/linux/rcupdate.h
2010-10-07Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'i7300_edac/linux_next'Stephen Rothwell
2010-10-07Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild
2010-10-07Merge remote branch 'suspend/linux-next'Stephen Rothwell
2010-10-07Merge branch 'quilt/aoe'Stephen Rothwell
2010-10-07Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'watchdog/master'Stephen Rothwell
2010-10-07Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-10-07Merge remote branch 'security-testing/next'Stephen Rothwell
2010-10-07Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-10-07Merge remote branch 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_i2c.c
2010-10-07Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/mfd/sh_mobile_sdhi.c
2010-10-07Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
Conflicts: drivers/char/sysrq.c
2010-10-07Merge remote branch 'mmc/mmc-next'Stephen Rothwell
2010-10-07Merge remote branch 'battery/master'Stephen Rothwell
2010-10-07Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/net/pcmcia/smc91c92_cs.c
2010-10-07Merge remote branch 'block/for-next'Stephen Rothwell
Conflicts: fs/ext4/mballoc.c
2010-10-07Merge remote branch 'input/next'Stephen Rothwell
Conflicts: drivers/input/keyboard/Kconfig
2010-10-07Merge branch 'quilt/rr'Stephen Rothwell
2010-10-07Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-10-07Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: drivers/video/sh_mobile_hdmi.c
2010-10-07Merge remote branch 'crypto/master'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/devices.c
2010-10-07Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/pcmcia/pcnet_cs.c drivers/net/wireless/ipw2x00/ipw2200.c net/caif/caif_socket.c
2010-10-07Merge remote branch 'wireless/master'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/board-omap3pandora.c arch/arm/mach-omap2/board-zoom-peripherals.c drivers/net/wireless/libertas/if_sdio.c
2010-10-07Merge remote branch 'async_tx/next'Stephen Rothwell
2010-10-07Merge remote branch 'scsi/master'Stephen Rothwell
2010-10-07Merge remote branch 'kvm/linux-next'Stephen Rothwell
2010-10-07Merge remote branch 'ubi/linux-next'Stephen Rothwell
2010-10-07Merge remote branch 'acpi/test'Stephen Rothwell
2010-10-07Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-10-07Merge remote branch 'v4l-dvb/master'Stephen Rothwell
2010-10-07Merge remote branch 'hwmon-staging/hwmon-next'Stephen Rothwell
2010-10-07Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-10-07Merge branch 'quilt/i2c'Stephen Rothwell
2010-10-07Merge remote branch 'hid/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-10-07Merge remote branch 'ceph/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'genesis/master'Stephen Rothwell
2010-10-07Merge remote branch 'sh/master'Stephen Rothwell
2010-10-07Merge remote branch 's390/features'Stephen Rothwell
2010-10-07Merge remote branch 'powerpc/next'Stephen Rothwell
2010-10-07Merge remote branch 'microblaze/next'Stephen Rothwell
2010-10-07Merge remote branch 'm68knommu/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'm68k/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'ia64/test'Stephen Rothwell
2010-10-07Merge remote branch 's5p/for-next'Stephen Rothwell
2010-10-07Merge remote branch 'omap/for-next'Stephen Rothwell