| commit | b93a4afcff7be859e30cad2a305731516057d6cf | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 02 23:29:32 2010 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Mar 02 23:29:32 2010 +0000 |
| tree | fb5fe55864e16527e453efd18790a34db22ee2a1 | |
| parent | 62c132a8008991530839401674ce8e1b12b005d3 [diff] | |
| parent | 9b1489e989695c4d502865f8bec616c0f17e99ab [diff] |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable Conflicts: arch/arm/Makefile