DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'drivers-platform' into release

Browse Source 
Conflicts:
	drivers/misc/Kconfig

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2009-01-09 04:01:26 -05:00
parent ec9f168fcc b4f9fe1215
commit d97c0defba
25 changed files with 409 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/Makefile
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/