| commit | 500b9fc922cbec572f4fd1436533bfaed5011262 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Aug 06 18:13:19 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Fri Aug 06 18:13:19 2010 +0100 |
| tree | aac4b7de0871e66740aeaf3510f7a59280026592 | |
| parent | f165eb77f49cb6f6e86e2f2f09183904b2965d19 [diff] | |
| parent | beccb12f6fbcc73339f127ff1f00638f076c933f [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable Conflicts: drivers/net/irda/sh_irda.c