]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'link_removal' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 16:52:43 +0000 (09:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Nov 2008 16:52:43 +0000 (09:52 -0700)
* 'link_removal' of git://www.jni.nu/cris:
  [CRIS] Remove links from CRIS build
  [CRIS] Merge asm-offsets.c for both arches into one file.


Trivial merge