Merge branch 'drivers-platform' into release

Conflicts:
	drivers/misc/Kconfig

Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
Len Brown 2009-01-09 04:01:26 -05:00
commit d97c0defba
25 changed files with 409 additions and 382 deletions

View file

@ -105,3 +105,4 @@ obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_STAGING) += staging/
obj-y += platform/