tree 418b05ddc854b09d64f7d5ee0c78875e42b5f151
parent 444c1953d496d272208902ff7010dc70d1f887f0
parent 2c1f1895ef2aa8f0e5497893eff71304aef332e1
author Jaroslav Kysela <perex@perex.cz> 1262939194 +0100
committer Jaroslav Kysela <perex@perex.cz> 1262939194 +0100

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