git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6c2794a
58c59bc
)
Merge branch 'master' into for-3.12/upstream
author
Jiri Kosina
<jkosina@suse.cz>
Wed, 4 Sep 2013 08:49:39 +0000
(10:49 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Wed, 4 Sep 2013 08:49:57 +0000
(10:49 +0200)
Sync with Linus' tree to be able to apply fixup patch on top
of
9d9a04ee75
("HID: apple: Add support for the 2013 Macbook Air")
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Trivial merge