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)
commitcdce1f0931831cebfbeb811a266a2f4adf5c8a35
tree6d7e41800f767e34ea33eeedb6c4a9bb6dd7052c
parent0242909a6135e10a28822c64f9ad50fdad52757c
parentc5ec6fb08d7806cf1a9e4fceed15f5d4a69f885e
Merge branch 'link_removal' of git://jni.nu/cris

* '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.