diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 18:27:34 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 18:27:34 +0900 |
| commit | 1928e87bcf185f56008d0746f887b691c1cb8c4a (patch) | |
| tree | bc8db9e9cb40b73742d05e2e68189bd647687249 /arch/arm/include/asm/auxvec.h | |
| parent | ca9c20ce2b383032b71bdae9ec0b468d428ca8d4 (diff) | |
| parent | 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/video/sh_mobile_lcdcfb.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/include/asm/auxvec.h')
0 files changed, 0 insertions, 0 deletions