git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f53f292 c1be5a5)
Merge tag 'v3.9' into efi-for-tip2
authorMatt Fleming <matt.fleming@intel.com>
Tue, 30 Apr 2013 10:30:24 +0000 (11:30 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Tue, 30 Apr 2013 10:42:13 +0000 (11:42 +0100)
Resolve conflicts for Ingo.

Conflicts:
drivers/firmware/Kconfig
drivers/firmware/efivars.c

Signed-off-by: Matt Fleming <matt.fleming@intel.com>

Trivial merge
Pandora Kernel Repository