diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:57:23 +0100 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-22 13:57:23 +0100 |
| commit | 1fd0ee3998c4ea542b3990b80e1bd8663ca28fe7 (patch) | |
| tree | 1bd8f6a2b953c17179f968e9063c9295904a331e /arch/s390/appldata | |
| parent | 5dcc9e4e521eaa806dcfaa359a29ee7a3ee48dd5 (diff) | |
| parent | 0f934952e071d73916be967d44a150c408edf2cb (diff) | |
Merge branch 'gta02-machine-2.6.32' into gta02-machine-devices-2.6.32
Conflicts:
arch/arm/mach-s3c2442/include/mach/gta02.h
arch/arm/mach-s3c2442/mach-gta02.c
Diffstat (limited to 'arch/s390/appldata')
0 files changed, 0 insertions, 0 deletions