tree f87648beb18ba1fc36e93195d1e1877527563e71
parent 5e8aa85253513b9c1ade8bd71dc341218a752a65
parent ebb812cb8df48e299b3d4ab75cbb0042384ef70d
author Takashi Iwai <tiwai@suse.de> 1274349577 +0200
committer Takashi Iwai <tiwai@suse.de> 1274349577 +0200

Merge branch 'topic/jack' into for-linus