Merge branch 'master' into i915res syslinux-3.85-pre61
authorH. Peter Anvin <hpa@zytor.com>
Sat, 23 Jan 2010 01:42:47 +0000 (17:42 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 23 Jan 2010 01:42:47 +0000 (17:42 -0800)
commit5c0f48e49f8d7d084810ecf0b98a76aaebb44835
treef870055f4a82f7db0e3b8f0984d95ec23990bf17
parent5d4ade0221c2387345d0a82422866bb8b937cb09
parentaab6f6014b1719db0254f108d89bb0b6750c822a
Merge branch 'master' into i915res