leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18cbc7d94c
linux/arch/arm/mach-davinci
History
Linus Torvalds 3e5b08cbbf Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 
* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (144 commits)
  USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004)
  USB: serial: ftdi_sio: add support for TIOCSERGETLSR
  USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport
  USB: atmel_usba_udc: fix freeing irq in usba_udc_remove()
  usb: ehci-omap: fix tll channel enable mask
  usb: ohci-omap3: fix trivial typo
  USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096
  USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's
  USB: gadget: update ci13xxx to work with g_ether
  USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers
  Revert "USB: musb: pm: don't rely fully on clock support"
  Revert "USB: musb: blackfin: pm: make it work"
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  ...

Manually fix up trivial conflicts in USB Kconfig changes in:
	arch/arm/mach-omap2/Kconfig
	arch/sh/Kconfig
	drivers/usb/Kconfig
	drivers/usb/host/ehci-hcd.c
and annoying chip clock data conflicts in:
	arch/arm/mach-omap2/clock3xxx_data.c
	arch/arm/mach-omap2/clock44xx_data.c
2011-01-07 13:16:28 -08:00
..
include/mach Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
aemif.c davinci: aemif: signedness bug in davinci_aemif_setup_timing() 2010-12-10 07:33:51 -08:00
board-da830-evm.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-da850-evm.c davinci: am18x/da850/omap-l138 evm: add support for higher speed grades 2010-12-22 11:45:29 -08:00
board-dm355-evm.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
board-dm355-leopard.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
board-dm365-evm.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-dm644x-evm.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-dm646x-evm.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-mityomapl138.c davinci: fix remaining board support after io_pgoffst removal 2010-10-21 17:03:36 -07:00
board-neuros-osd2.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-omapl138-hawk.c davinci: fix remaining board support after io_pgoffst removal 2010-10-21 17:03:36 -07:00
board-sffsdr.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
board-tnetv107x-evm.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
cdce949.c davinci: misc cleanups from sparse 2010-05-06 15:02:01 -07:00
clock.c davinci: use divide ratio limits from pll_data 2010-12-10 07:33:49 -08:00
clock.h ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
common.c Davinci: aintc/cpintc - use ioremap() 2010-05-13 10:05:28 -07:00
cp_intc.c Davinci: aintc/cpintc - use ioremap() 2010-05-13 10:05:28 -07:00
cpufreq.c davinci: cpufreq: add support for keeping an additional clock constant 2010-09-24 07:40:25 -07:00
cpuidle.c davinci: cpuidle: move mapping of DDR2 controller registers out of driver 2010-02-04 13:29:38 -08:00
da830.c davinci: da8xx: sparse cleanup: remove duplicate entries in irq priorities 2010-08-05 09:58:23 -07:00
da850.c davinci: am18x/da850/omap-l138: add support for higher speed grades 2010-12-22 11:45:29 -08:00
devices-da8xx.c davinci: cleanup mdio arch code and switch to phy_id 2010-09-24 07:40:30 -07:00
devices-tnetv107x.c davinci: minor tnetv107x clock tree fixes 2010-12-10 07:33:50 -08:00
devices.c Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci 2010-10-25 10:59:31 -07:00
dm355.c ASoC: davinci: fixes for multi-component 2010-11-17 18:36:40 +00:00
dm365.c ASoC: davinci: fixes for multi-component 2010-11-17 18:36:40 +00:00
dm644x.c ASoC: davinci: fixes for multi-component 2010-11-17 18:36:40 +00:00
dm646x.c Merge branch 'davinci-next' into davinci-for-linus 2010-10-21 11:21:55 -07:00
dma.c arm: mach-davinci: check irq2ctlr() result 2010-09-24 07:40:25 -07:00
gpio-tnetv107x.c Davinci: tnetv107x initial gpio support 2010-06-21 12:48:31 -07:00
gpio.c Davinci: gpio - use ioremap() 2010-05-13 10:05:22 -07:00
io.c Davinci: iotable based ioremap() interception 2010-05-13 10:05:31 -07:00
irq.c Davinci: aintc/cpintc - use ioremap() 2010-05-13 10:05:28 -07:00
Kconfig da850-evm: KEYBOARD_GPIO_POLLED Kconfig conditional 2010-12-22 11:45:20 -08:00
Makefile davinci: Initial support for Omapl138-Hawkboard 2010-09-24 07:40:32 -07:00
Makefile.boot davinci: da8xx: Add base DA830/OMAP-L137 SoC support 2009-08-26 10:56:59 +03:00
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm.c davinci: add power management support 2010-02-04 13:29:55 -08:00
psc.c davinci: psc: simplify if-statement 2010-12-10 07:33:50 -08:00
serial.c Davinci: serial - conditional reset via pwremu 2010-05-06 15:02:10 -07:00
sleep.S davinci: add power management support 2010-02-04 13:29:55 -08:00
sram.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
time.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
tnetv107x.c davinci: minor tnetv107x clock tree fixes 2010-12-10 07:33:50 -08:00
usb.c DA8xx: assign name to MUSB IRQ resource 2010-12-11 12:15:53 +02:00