diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 01:41:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 01:41:23 -0700 |
| commit | 865147c09c720e6657a08d81419321c84b8f77fb (patch) | |
| tree | 63928a561ff65529db63615b66cb3b1024a156f8 /kernel | |
| parent | f18badd1890b8fab776e59a902968c846ea42f0f (diff) | |
| parent | 55be7f8d5ec11342d1ed1a2131f9296e128c3e6b (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.6-mmc
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Manual merge of arch/arm/Kconfig conflicts
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions