| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Fri Jan 07 10:29:26 2011 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Fri Jan 07 10:29:26 2011 +0900 |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 | |
| parent | 98d27b8abf413a310df6676f7d2128ada1cccc08 [diff] | |
| parent | 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>