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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b492e95 d515e86)

author	Jens Axboe <jens.axboe@oracle.com>
	Fri, 21 May 2010 19:27:26 +0000 (21:27 +0200)
committer	Jens Axboe <jens.axboe@oracle.com>
	Fri, 21 May 2010 19:27:26 +0000 (21:27 +0200)
commit	ee9a3607fb03e804ddf624544105f4e34260c380
tree	ce41b6e0fa10982a306f6c142a92dbf3c9961284	tree \| snapshot
parent	b492e95be0ae672922f4734acf3f5d35c30be948	commit \| diff
parent	d515e86e639890b33a09390d062b0831664f04a2	commit \| diff

Merge branch 'master' into for-2.6.35

Conflicts:
fs/ext3/fsync.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

13 files changed:

block/blk-cgroup.c	diff1 \|	diff2 \|	blob \| history
block/cfq-iosched.c	diff1 \|	diff2 \|	blob \| history
drivers/block/drbd/drbd_worker.c	diff1 \|	diff2 \|	blob \| history
fs/ext3/fsync.c	diff1 \|	diff2 \|	blob \| history
fs/fcntl.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/rgrp.c	diff1 \|	diff2 \|	blob \| history
fs/nilfs2/the_nilfs.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_super.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree