53b3e76a70e4ca6f77e29bcd47124d8b6a0b208e
parent 7b5ca22643beba8fdd5b7055e0594a514b3710d7
parent 999fb23ef868719b8bd55ee3f6b1f7a8fd8016af
author Linus Torvalds <torvalds@linux-foundation.org> 1242071021 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242071021 -0700

Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

* 'for-linus' of git://repo.or.cz/cris-mirror:
  CRISv32: Fix typo compile error in ARTPEC-3 gpio driver.
  CRIS: Wire up syscalls signalfd4 to writev.
  CRISv32: Remove obsolete vcs_hook.o from Makefile
  CRIS: Merge machine dependent boot/compressed and boot/rescue
�O�F�*x