tree bd940c4a039468a925adbadc433fc9a5a10e725b
parent a3c6048dcfe3d7015e591b81c547b6df707b0859
parent e776ec19a47a325ee1d9ece2d983526dcd626c53
author Takashi Iwai <tiwai@suse.de> 1237851362 +0100
committer Takashi Iwai <tiwai@suse.de> 1237851362 +0100

Merge branch 'topic/docbook-fix' into for-linus