summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-25 13:51:45 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-04-25 13:51:45 -0700
commit2fb90b128aaf7758e3de22119515fb11174d4f23 (patch)
tree082a1b9eaa0c17ca6ccae3aef03f58a77d60dc69 /Makefile
parent707abb7986293b24b83dba163ffc79d8895236f9 (diff)
parent5a68b2e346f043820e2ba0cde57cc75b4561c124 (diff)
downloadlwn-2fb90b128aaf7758e3de22119515fb11174d4f23.tar.gz
lwn-2fb90b128aaf7758e3de22119515fb11174d4f23.zip
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: [PARPORT] SUNBPP: Fix OOPS when debugging is enabled. [SPARC] openprom: Switch to ref counting PCI API
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions