aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-12-31 17:24:58 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-31 17:24:58 -0500
commit9d572ecbd81b9ff6e6a9bc0d2598212a59eb738a (patch)
treeb59b6610928accc3289f7d142319bb19342eee98 /kernel
parentb836267aa79c1c5e23e00d9cec047b6870ae0db1 (diff)
parentf4060c0dbbe9ad7b8c0aeefa142398c8d3468bac (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]: Handle ISA devices with no 'regs' property. [SPARC64]: Update defconfig. [SPARC64]: Fix of_iounmap() region release. [SPARC64]: Fix "mem=xxx" handling.
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions