tree b153e8aeb6439c3f7bc150ad9e6e3ff9d57849a0
parent b54fc8dd2c43888f2754505cca2b6e88604a8ffa
parent d563ffa6b319a4e401d096db9014a947590ca081
author Takashi Iwai <tiwai@suse.de> 1237851379 +0100
committer Takashi Iwai <tiwai@suse.de> 1237851379 +0100

Merge branch 'topic/pcxhr' into for-linus