aboutsummaryrefslogtreecommitdiffstats
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
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[PARPORT] SUNBPP: Fix OOPS when debugging is enabled. (diff)
downloadlinux-dev-2fb90b128aaf7758e3de22119515fb11174d4f23.tar.xz
linux-dev-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