git.karo-electronics.de Git - mv-sheeva.git/commit

]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/w1/slaves/w1_ds2431.c

author	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 9 Aug 2010 09:36:44 +0000 (10:36 +0100)
committer	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 9 Aug 2010 09:36:44 +0000 (10:36 +0100)
commit	2144381da478cc4aa3a29ee29b0c5e6ddaaced14
tree	380a29fec86b537ed602d12f4050654b1c66c27c	tree \| snapshot
parent	45d7f32c7a43cbb9592886d38190e379e2eb2226	commit \| diff
parent	e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1	commit \| diff

Merge branch 'async' of macbook:git/btrfs-unstable

Conflicts:
drivers/md/Makefile
lib/raid6/unroll.pl

Linux for Marvell Sheeva based platforms