]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'x86_pkg_temp' and 'misc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 25 Sep 2013 13:41:44 +0000 (21:41 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 25 Sep 2013 13:41:44 +0000 (21:41 +0800)

Trivial merge