projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9fbd9a 24924ec)
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:08:56 +0000 (17:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:08:56 +0000 (17:08 -0700)
* 'for-linus' of git://repo.or.cz/cris-mirror:
  CRIS: Cleanup linker script using new linker script macros.
  ARRAY_SIZE changes
  CRIS: convert to asm-generic/hardirq.h
  CRISv10: Don't autonegotiate if autonegotiation is off
  CRIS: fix defconfig build failure
  CRIS: add pgprot_noncached

1  2 
arch/cris/kernel/vmlinux.lds.S patch | diff1 | diff2 | blob | history
drivers/net/cris/eth_v10.c patch | diff1 | diff2 | blob | history

diff --cc arch/cris/kernel/vmlinux.lds.S
Simple merge
diff --cc drivers/net/cris/eth_v10.c
Simple merge
Domain: System / Uncategorized;