Merge remote-tracking branch 'pcacjr/ntfs-for-hpa'
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 13 Dec 2011 23:34:59 +0000 (15:34 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 13 Dec 2011 23:34:59 +0000 (15:34 -0800)

Trivial merge