apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into for-upstream

Browse Source 
Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile
This commit is contained in:
David Vrabel
2008-10-20 16:07:19 +01:00
parent c15895ef30 0cfd81031a
commit 61e0e79ee3
6522 changed files with 533546 additions and 169022 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/Makefile
+1
View File
@@ -99,4 +99,5 @@ obj-$(CONFIG_OF) += of/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_REGULATOR) += regulator/
obj-$(CONFIG_STAGING) += staging/
obj-$(CONFIG_UWB) += uwb/