OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5199459 d109028)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorYoshinori Sato <ysato@users.sourceforge.jp>
Wed, 16 Mar 2011 16:46:23 +0000 (01:46 +0900)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Wed, 16 Mar 2011 16:46:23 +0000 (01:46 +0900)
commit37031d285486cf68342dfb468868fb94e46c14a6
treea7927de34f2b67cd302674eef0ccb4fa9d211f78tree | snapshot
parent5199459aba5df85dad2adcab0eb6f5da87c8a6facommit | diff
parentd10902812c9cd5583130a4ebb9ad19c60b68149dcommit | diff
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
fs/btrfs/extent_io.c
kernel/irq/internals.h
kernel/perf_event.c
sound/soc/codecs/wm8994.c
drivers/gpu/drm/i915/i915_gem_tiling.c diff1 | diff2 | blob | history
sound/soc/codecs/wm8994.c diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help