Merge branch 'for-linus' into for-next
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Thu, 23 Apr 2009 20:56:58 +0000 (22:56 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Thu, 23 Apr 2009 20:56:58 +0000 (22:56 +0200)

Trivial merge