| commit | 949abd84cd54ff864efca9df822d1e02a56694ec | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | Fri May 29 20:03:43 2009 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri May 29 20:03:43 2009 +0100 |
| tree | 0c0e7696a51e2989f11a37478ff26368cab0e227 | |
| parent | b0958aed1ea39825439a7848544bfb2e267273b4 [diff] | |
| parent | cd07ecc828486e5887113c7dc4d9f9022145811b [diff] |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel Conflicts: arch/arm/Makefile