git.maquefel.me Git - linux.git/commit

author	J. Bruce Fields <bfields@citi.umich.edu>
	Tue, 4 May 2010 15:27:05 +0000 (11:27 -0400)
committer	J. Bruce Fields <bfields@citi.umich.edu>
	Tue, 4 May 2010 15:29:05 +0000 (11:29 -0400)
commit	5306293c9cd2caf41849cc909281bda628bb989e
tree	3be4e8231e2772c8a43ddbef5c6a72c20b3054bb	tree \| snapshot
parent	dbd65a7e44fff4741a0b2c84bd6bace85d22c242	commit \| diff
parent	66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8	commit \| diff

Merge commit 'v2.6.34-rc6'

Conflicts:
fs/nfsd/nfs4callback.c

ep93xx device tree rework repo: git://git.maquefel.me/linux.git