Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2...
authorJoel Becker <joel.becker@oracle.com>
Tue, 18 May 2010 23:40:42 +0000 (16:40 -0700)
committerJoel Becker <joel.becker@oracle.com>
Tue, 18 May 2010 23:40:42 +0000 (16:40 -0700)

Trivial merge