]> git.karo-electronics.de Git - mv-sheeva.git/commit - usr/gen_init_cpio.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 19:02:05 +0000 (11:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 19:02:05 +0000 (11:02 -0800)
commit03a4491f5d6835028dbbcf36990599c5c9f6ff55
treee2abb2baa5b71dcf1eb3786f339afbae5d27d7e4
parent7b0cb1bdac9e941141e3790785955ed933d476f3
parent1427130425c1239d977e8891c3a8923f53a6e352
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO