git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	0bb275b175ddba2fe0ecb4d9ece4ad876f281991
tree	3be4e8231e2772c8a43ddbef5c6a72c20b3054bb	tree \| snapshot
parent	b7f45273dbc3419425c19cf7d3fcd0cdddc53972	commit \| diff
parent	8bdaf5c0ae1ac4a9355b3822e3eb73650e0c9096	commit \| diff

Merge commit 'v2.6.34-rc6'

Conflicts:
fs/nfsd/nfs4callback.c

Linux Kernel Source Tree.