kevin/linux
1
Fork 0
Code
021db8e2bd
linux/arch/arm
History
Linus Torvalds 021db8e2bd Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
  spi/omap: Fix DMA API usage in OMAP MCSPI driver
  spi/imx: correct the test on platform_get_irq() return value
  spi/topcliff: Typo fix threhold to threshold
  spi/dw_spi Typo change diable to disable.
  spi/fsl_espi: change the read behaviour of the SPIRF
  spi/mpc52xx-psc-spi: move probe/remove to proper sections
  spi/dw_spi: add DMA support
  spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
  spi/dw_spi: Fix too short timeout in spi polling loop
  spi/pl022: convert running variable
  spi/pl022: convert busy flag to a bool
  spi/pl022: pass the returned sglen to the DMA engine
  spi/pl022: map the buffers on the DMA engine
  spi/topcliff_pch: Fix data transfer issue
  spi/imx: remove autodetection
  spi/pxa2xx: pass of_node to spi device and set a parent device
  spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
  spi/pxa2xx: Add chipselect support for Sodaville
  spi/pxa2xx: Consider CE4100's FIFO depth
  spi/pxa2xx: Add CE4100 support
  ...
2011-01-07 17:08:46 -08:00
..
boot Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel 2011-01-05 18:08:10 +00:00
common Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
configs Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2011-01-07 14:50:14 -08:00
include/asm Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
kernel Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
lib Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-aaec2000
mach-at91 Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
mach-bcmring Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-clps711x
mach-cns3xxx Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-davinci Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
mach-dove
mach-ebsa110
mach-ep93xx Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-footbridge
mach-gemini
mach-h720x
mach-imx Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-integrator Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-iop13xx Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-iop32x
mach-iop33x
mach-ixp4xx Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-ks8695 ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() 2011-01-03 11:27:43 +00:00
mach-l7200/include/mach
mach-lh7a40x
mach-loki
mach-lpc32xx Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-mmp Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-msm Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
mach-mv78xx0
mach-mx3 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-mx5 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-mxc91231 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-mxs
mach-netx ARM: netx: update clock source registration 2010-12-22 22:44:33 +00:00
mach-nomadik
mach-ns9xxx ARM: ns9xxx: update clock source registration 2010-12-22 22:44:34 +00:00
mach-nuc93x
mach-omap1 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-01-06 19:13:58 -08:00
mach-omap2 Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
mach-orion5x Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-pnx4008 Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
mach-pxa Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
mach-realview Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx
mach-s3c2400
mach-s3c2410
mach-s3c2412 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-s3c2416
mach-s3c2440
mach-s3c2443
mach-s5p64x0
mach-s5p6442
mach-s5pc100
mach-s5pv210
mach-s5pv310 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-sa1100 Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
mach-shark
mach-shmobile ARM: mach-shmobile: update for SMP changes. 2011-01-07 12:03:22 +09:00
mach-spear3xx
mach-spear6xx
mach-stmp37xx
mach-stmp378x
mach-tcc8k Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-tegra Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-u300 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-ux500 Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
mach-versatile Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-vexpress Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mach-w90x900 Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
mm Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest 2011-01-07 10:29:26 +09:00
nwfpe
oprofile
plat-iop Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
plat-mxc Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
plat-nomadik Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
plat-omap Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2011-01-07 13:16:28 -08:00
plat-orion ARM: orion: convert sched_clock() to use new infrastructure 2010-12-22 22:44:49 +00:00
plat-pxa Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
plat-s3c24xx
plat-s5p
plat-samsung
plat-spear Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-01-07 14:45:47 -08:00
plat-stmp3xxx Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
plat-tcc
plat-versatile Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
tools
vfp Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
Kconfig Merge branch 'rmobile/smp' into rmobile-latest 2011-01-07 10:51:35 +09:00
Kconfig-nommu
Kconfig.debug Merge branch 'misc' into devel 2011-01-06 22:32:52 +00:00
Makefile Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new 2011-01-03 10:15:11 +01:00