Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jul 2010 02:02:51 +0000 (19:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 31 Jul 2010 02:02:51 +0000 (19:02 -0700)
commita63ecd835f075b21d7d5cef9580447f5fbb36263
tree952d222271e5aed0c500d3d31b39336f13db2943
parentfc71ff8a6c187ecc1ba79ee5688668af97a970fc
parente76df4d33973bd9b963d0cce05749b090cc14936
Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  cyber2000fb: fix console in truecolor modes
  cyber2000fb: fix machine hang on module load
  SA1111: Eliminate use after free
  ARM: Fix Versatile/Realview/VExpress MMC card detection sense
  ARM: 6279/1: highmem: fix SMP preemption bug in kmap_high_l1_vipt
  ARM: Add barriers to io{read,write}{8,16,32} accessors as well
  ARM: 6273/1: Add barriers to the I/O accessors if ARM_DMA_MEM_BUFFERABLE
  ARM: 6272/1: Convert L2x0 to use the IO relaxed operations
  ARM: 6271/1: Introduce *_relaxed() I/O accessors
  ARM: 6275/1: ux500: don't use writeb() in uncompress.h
  ARM: 6270/1: clean files in arch/arm/boot/compressed/
  ARM: Fix csum_partial_copy_from_user()