diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-23 18:06:37 +0000 |
| commit | 40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb (patch) | |
| tree | 0d949c487ba15c4c8198a69cd7b8c0cdb5773af4 /usr | |
| parent | d83a12a40915774332cec625856c2e7ba9033e15 (diff) | |
| parent | 3b24f30c4f678cfab5c6d090af9559fefa37cc41 (diff) | |
| download | linux-40321fd21c1eb1fb1886eea73b5f87c5e41ff2fb.tar.bz2 | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Conflicts:
arch/arm/mach-pxa/am200epd.c
arch/arm/mach-pxa/ezx.c
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions