Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 11 Aug 2010 07:36:51 +0000 (09:36 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 11 Aug 2010 07:36:51 +0000 (09:36 +0200)
Conflicts:
fs/exofs/inode.c


Trivial merge