projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e37a72d 6e990b5)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:40:35 +0000 (15:40 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Jun 2006 22:40:35 +0000 (15:40 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Kill sun4v virtual device layer.
  [SERIAL] sunhv: Convert to of_driver layer.
  [SPARC64]: Mask out top 8-bits in physical address when building resources.
  [SERIAL] sunsu: Missing return statement in su_probe().

1  2 
arch/sparc64/kernel/devices.c patch | diff1 | diff2 | blob | history
drivers/serial/sunsu.c patch | diff1 | diff2 | blob | history

diff --cc arch/sparc64/kernel/devices.c
Simple merge
diff --cc drivers/serial/sunsu.c
Simple merge
Domain: System / Kernel;