diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 11:35:02 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 11:35:02 +0100 |
| commit | 4b77b926aee4832bdb86b46fc5a7b0f2e4467225 (patch) | |
| tree | ca6050d70f12549a54e47f980313bf7f18e1097e /arch/arm/mach-mmp/include | |
| parent | eb97ba7e3da8998565058aedd3d57c1859083271 (diff) | |
| parent | efafd86ce0ed4494b150fd6b79965aaa65ff99dc (diff) | |
Merge branch 'gta02-machine-2.6.32' into gta02-machine-devices-2.6.32
Conflicts:
arch/arm/mach-s3c2442/Kconfig
arch/arm/mach-s3c2442/Makefile
arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch/arm/mach-mmp/include')
0 files changed, 0 insertions, 0 deletions