Merge remote branch 'sha0/memdskprobe'
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 26 Jan 2011 00:56:20 +0000 (16:56 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 26 Jan 2011 00:56:20 +0000 (16:56 -0800)
commit74d2110fd1023c7b03ef658f53ceb1372f29e979
treebaa1a9dc4218476c7625bc962453501c6dd39c1c
parent036fa4e1a8aefeba3f39ebd634fe242b0ab84ce3
parentf76c5d0d0ef296e6b5b942194137d6da593fa653
Merge remote branch 'sha0/memdskprobe'