From: Len Brown <len.brown@intel.com>
Date: Fri, 16 Jan 2009 19:45:11 +0000 (-0500)
Subject: Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release
X-Git-Tag: v2.6.29-rc2~1^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f1f055f1036a20742608c28ee82139f572dfd031;p=linux-2.6-omap-h63xx.git

Merge branches 'bugzilla-11884' and 'bugzilla-8544' into release
---

f1f055f1036a20742608c28ee82139f572dfd031