]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit - net/rxrpc/krxiod.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
authorLinus Torvalds <torvalds@woody.osdl.org>
Fri, 8 Dec 2006 16:47:07 +0000 (08:47 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Fri, 8 Dec 2006 16:47:07 +0000 (08:47 -0800)
commit1709775828de83b099554176b6d4971ebc772962
tree27541264c99d58477f9262ee7074cf7d7e5f7907
parent7bf65382caeecea4ae7206138e92e732b676d6e5
parentbf8c80a6a5153e7f170f240731c650eeed6d78ff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  mmc: fix au1xmmc build error
  mmc: pxamci compilation fix