projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1962fca 7241ea5)
Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 29 Apr 2015 05:28:29 +0000 (07:28 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 29 Apr 2015 05:28:29 +0000 (07:28 +0200)
commit49c4a4c5244d2c1a25ec1e01dbb4fba3813d237d
tree76f7980c634307d13c548790446d159149822446tree | snapshot
parent1962fcab4ee80e555bcc9d0f50e416800d474fa2commit | diff
parent7241ea558c6715501e777396b5fc312c372e11d9commit | diff
Merge branch 'for-linus' into for-next

Conflicts:
sound/pci/emu10k1/emu10k1_main.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/emu10k1/emu10k1_main.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.