| commit | 132a69c6cc3dfa7fa354a88128acee7e6ee7082b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Mar 01 17:28:31 2007 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Mar 01 17:28:31 2007 -0800 |
| tree | be77ed97c9c94cbcc9931c58ce1a061e9dc26755 | |
| parent | fb7d4045669b3ea0e92cf45963839a9808b7650c [diff] | |
| parent | 74bd7d093b8e87f35eaf3b14459b96a0e20d1d10 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix parport_pc build. [SPARC64]: Update defconfig.