diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 23:14:38 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-28 23:14:38 +0400 |
| commit | b3773301c4290f054aa2aa5379e59a1bf4f78bdf (patch) | |
| tree | aac1619d32800393b587bf034c7dadb9e3c24f7b /arch/arm/mach-s5pc100/include/mach/map.h | |
| parent | be6786ac738801d39cfd264ec88c352efd029578 (diff) | |
| parent | 1a0b1eac5012326e52d1dcf78695ac08f41c37d7 (diff) | |
| download | linux-b3773301c4290f054aa2aa5379e59a1bf4f78bdf.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
drivers/video/sh_mobile_hdmi.c
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/map.h')
0 files changed, 0 insertions, 0 deletions