diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:06:43 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 22:06:43 +0000 |
commit | 3560adf62075829393743667ff338dd8fd26a5c2 (patch) | |
tree | f6359884ab2812401394840142e3c1227844af90 /arch/arm/mach-omap1/board-osk.c | |
parent | c9a8fdd8b3ecdcfa3aa40e553c87c5787f5d70e4 (diff) | |
parent | 2ef7f3dbd7a70a48c3f09b498df528cb00ea03a4 (diff) | |
parent | 2725898fc9bb2121ac0fb1b5e4faf4fc09014729 (diff) | |
parent | 1587a373f06ab700004758d6970abb530decef76 (diff) | |
parent | e00d9d4b1796dae3adf6e39c9a766e760dd1c796 (diff) | |
parent | 6d636c68e9253fb641c325052bcf9ba513a58ed3 (diff) | |
parent | 2ffe2da3e71652d4f4cae19539b5c78c2a239136 (diff) | |
parent | cd71f8f48eda141404db78f7b01902ba3f9ab477 (diff) | |
parent | ae1402022edbeef3991f1e4bae8fa99558be291b (diff) | |
download | blackbird-op-linux-3560adf62075829393743667ff338dd8fd26a5c2.tar.gz blackbird-op-linux-3560adf62075829393743667ff338dd8fd26a5c2.zip |
Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-streaming', 'u300' and 'umc' into devel