tree 1dffc62d8b79b3d89459cf23aa59c553e186840a
parent d6d6a86e14a6b5a26c785b45268874a8f7a52b4d
parent c010b2f76c3032e48097a6eef291d8593d5d79a6
author Jiri Kosina <jkosina@suse.cz> 1216819140 +0200
committer Jiri Kosina <jkosina@suse.cz> 1216819140 +0200

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6