]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Mar 2007 01:28:31 +0000 (17:28 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 2 Mar 2007 01:28:31 +0000 (17:28 -0800)
commit7eb5d5022cfd595cb8c45898cc42bfc9d86dfed7
treebe77ed97c9c94cbcc9931c58ce1a061e9dc26755
parentf036a51f8b4b021dee83be71645d381fe94dcc22
parentafef79f1f63aaf0f8eb247dd1ba9a6d8fb67bef5
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.