www.infradead.org Git - users/hch/uuid.git/commit

author	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 20 Dec 2012 15:24:17 +0000 (07:24 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 20 Dec 2012 15:24:17 +0000 (07:24 -0800)
commit	0c5445015c8e37d4f79c16fa51be398c4cb0e46c
tree	d5043bad8b42de2872d18f4a5c8ff63492718d88	tree
parent	1ffab3d4139533eff6e27b7568825307e575faa6	commit \| diff
parent	77c8006d8df4d5bafeb1d15eafa0886ae96e9b17	commit \| diff

Merge tag 'cris-for-linus-3.8' of git://jni.nu/cris

Pull CRIS changes from Jesper Nilsson.

... mainly the UAPI disintegration.

* tag 'cris-for-linus-3.8' of git://jni.nu/cris:
  UAPI: Fix up empty files in arch/cris/
  CRIS: locking: fix the return value of arch_read_trylock()
  CRIS: use kbuild.h instead of defining macros in asm-offset.c
  UAPI: (Scripted) Disintegrate arch/cris/include/asm
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v32/arch
  UAPI: (Scripted) Disintegrate arch/cris/include/arch-v10/arch