git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f314eb
c182ae4
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author
Dave Airlie
<airlied@redhat.com>
Mon, 27 Aug 2012 06:22:20 +0000
(16:22 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 27 Aug 2012 06:22:20 +0000
(16:22 +1000)
There was some merge conflicts in -next and they weren't so pretty, so
backmerge now to avoid them.
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_modes.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff