summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2010-05-07Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/input/tablet/acecad.c drivers/input/tablet/kbtab.c drivers/input/tablet/wacom_sys.c sound/usb/usbaudio.c
2010-05-07Merge remote branch 'bkl-ioctl/bkl/ioctl'Stephen Rothwell
Conflicts: arch/cris/arch-v10/drivers/ds1302.c drivers/block/pktcdvd.c
2010-05-07Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt
2010-05-07Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/board-rx51-peripherals.c
2010-05-07Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2010-05-07Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2010-05-07Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild lib/Kconfig
2010-05-07Merge remote branch 'fsnotify/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/radeon/r300.c
2010-05-07Merge remote branch 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/dma/Makefile drivers/dma/timb_dma.c
2010-05-07Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-05-07Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-05-07Merge remote branch 'sound/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'crypto/master'Stephen Rothwell
Conflicts: arch/arm/mach-omap2/devices.c
2010-05-07Merge remote branch 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/mtdcore.c
2010-05-07Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/scsi/iscsi_tcp.c
2010-05-07Merge remote branch 'async_tx/next'Stephen Rothwell
2010-05-07Merge remote branch 'kvm/linux-next'Stephen Rothwell
2010-05-07Merge remote branch 'acpi/test'Stephen Rothwell
2010-05-07Merge remote branch 'kbuild/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-05-07Merge remote branch 'genesis/master'Stephen Rothwell
2010-05-07Merge remote branch 'sh/master'Stephen Rothwell
2010-05-07Merge remote branch 's390/features'Stephen Rothwell
2010-05-07Merge remote branch '52xx-and-virtex/next'Stephen Rothwell
2010-05-07Merge remote branch '4xx/next'Stephen Rothwell
2010-05-07Merge remote branch 'powerpc/next'Stephen Rothwell
2010-05-07Merge remote branch 'microblaze/next'Stephen Rothwell
2010-05-07Merge remote branch 'm68knommu/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'cris/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'omap/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'msm/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-msm/Kconfig
2010-05-07Merge remote branch 'i.MX/for-next'Stephen Rothwell
2010-05-07Merge remote branch 'davinci/davinci-next'Stephen Rothwell
2010-05-07Merge remote branch 'arm/devel'Stephen Rothwell
2010-05-07Merge remote branch 'arm-current/master'Stephen Rothwell
2010-05-07usb: musb: Add extvbus in musb_board_dataAjay Kumar Gupta
EXTVBUS programming is required by OMAP3EVM REV >=E to supply 500mA power so adding a flag which can be used by musb driver to program EXTVBUS. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-06Merge branch 'x86/urgent' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/timers' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/mm' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/irq' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/fpu' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/cpu' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/cleanups' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/atomic' into auto-latestIngo Molnar
2010-05-06Merge branch 'x86/asm' into auto-latestIngo Molnar
2010-05-06Merge branch 'timers/cleanup' into auto-latestIngo Molnar
2010-05-06Merge branch 'oprofile' into auto-latestIngo Molnar
2010-05-06Merge branch 'core/hweight' into auto-latestIngo Molnar