OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a8c81c f71194a)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorYoshinori Sato <ysato@users.sourceforge.jp>
Fri, 21 Jun 2013 18:34:48 +0000 (03:34 +0900)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Fri, 21 Jun 2013 18:34:48 +0000 (03:34 +0900)
commit497e59f5d03236871555c519639f5f3340c5d208
tree69080db5da3b8725a0d277c639059b3dba064576tree | snapshot
parent5a8c81c6e12b1cc5b9c9ca6710b3c3f265df5739commit | diff
parentf71194a7d47c1da787555d27aac63973ca72323bcommit | diff
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/gpu/drm/i915/i915_gem_tiling.c
sound/soc/codecs/wm8994.c
About OSDN
Find Software
Develop Software
Help