a184d4e4591bb53fd8b91d6e8b85cffa261fb83e - arm/linux - Git at Google

commit: a184d4e4591bb53fd8b91d6e8b85cffa261fb83e
[log] [tgz]
author: Takashi Iwai <tiwai@suse.de>
Tue Aug 28 09:26:59 2012 -0700
committer: Takashi Iwai <tiwai@suse.de>
Tue Aug 28 09:26:59 2012 -0700
tree: d8d530703e39fcfd612934105d5e1b5fab94d85c
parent: 5d908ab941e90291b5c31d990bdb8e87fa3f7146 [diff]
parent: c36b5b054aaf14d68261970e3769398110e636d8 [diff]

Merge branch 'for-linus' into for-next

Need to merge the fixes regarding EPSS.

Conflicts:
	sound/pci/hda/hda_codec.c

tree: d8d530703e39fcfd612934105d5e1b5fab94d85c