Merge branch 'fix/misc' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 11:03:58 +0000 (13:03 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 11:03:58 +0000 (13:03 +0200)
commitcdccfc8dc0bf62a1da327324a8d639139acc9279
treedca7934b27d510c9c006558979ebc48e07a531cf
parentb21a8ee67013372f439fbd1591e91d09de49bb9c
parentc6b358748e19ce7e230b0926ac42696bc485a562
Merge branch 'fix/misc' into topic/misc
drivers/media/radio/Kconfig
drivers/media/radio/Makefile