git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dd3932e cd07202)

author	Jens Axboe <jaxboe@fusionio.com>
	Tue, 19 Oct 2010 07:13:04 +0000 (09:13 +0200)
committer	Jens Axboe <jaxboe@fusionio.com>
	Tue, 19 Oct 2010 07:13:04 +0000 (09:13 +0200)
commit	fa251f89903d73989e2f63e13d0eaed1e07ce0da
tree	3f7fe779941e3b6d67754dd7c44a32f48ea47c74	tree \| snapshot
parent	dd3932eddf428571762596e17b65f5dc92ca361b	commit \| diff
parent	cd07202cc8262e1669edff0d97715f3dd9260917	commit \| diff

Merge branch 'v2.6.36-rc8' into for-2.6.37/barrier

Conflicts:
block/blk-core.c
drivers/block/loop.c
mm/swapfile.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

19 files changed:

Documentation/lguest/lguest.c	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	diff1 \|	diff2 \|	blob \| history
block/blk.h	diff1 \|	diff2 \|	blob \| history
block/elevator.c	diff1 \|	diff2 \|	blob \| history
drivers/block/pktcdvd.c	diff1 \|	diff2 \|	blob \| history
drivers/block/virtio_blk.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkfront.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/md.h	diff1 \|	diff2 \|	blob \| history
drivers/md/raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/log.c	diff1 \|	diff2 \|	blob \| history
fs/nilfs2/the_nilfs.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_buf.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_buf.h	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_super.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_log.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
mm/swapfile.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree