diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:27:40 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:27:40 -0400 |
commit | ec19628d72cff8f80220b7cedba089074ac6a599 (patch) | |
tree | c3ec69d6648fdfd3e19563fa341d6585a3d77567 /arch/arm/mach-imx/pcm037.h | |
parent | 4b60e5f90dec4ae251386f20464336369e962e9c (diff) | |
parent | b0ec5cf191eeca7fd885ef2860e9a586d29bff00 (diff) | |
parent | 603605abae9ee731bdafb2af83a487d98a568815 (diff) | |
parent | 8373dc38ca8d4918210710807256a313cd111f0b (diff) | |
parent | 399bc4863e2a3b4b255ca22189820c81ca34f4e0 (diff) | |
parent | 16dc062b42459e6ddd244c2bc8255cac45db47e4 (diff) | |
parent | f1f6ac111d6b1c55a604afbbff966e284b392050 (diff) |
Merge branches 'consolidate', 'ep93xx', 'fixes', 'misc', 'mmci', 'remove' and 'spear' into for-linus