From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 21 Dec 2007 01:02:22 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~36029
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2b5baad1656d2e193308333636707ace4a2fff56;p=mirror_ubuntu-artful-kernel.git

Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] Initialise current offset in xfs_file_readdir correctly
  [XFS] Fix mknod regression
---

2b5baad1656d2e193308333636707ace4a2fff56