forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 'staging-next' to Linus's tree

Browse source 
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-10-28 09:44:56 -07:00
commit e4c5bf8e3d
1365 changed files with 420044 additions and 147476 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/Kbuild
View file

@ -326,10 +326,6 @@ header-y += serio.h
header-y += shm.h
header-y += signal.h
header-y += signalfd.h
header-y += smb.h
header-y += smb_fs.h
header-y += smb_mount.h
header-y += smbno.h
header-y += snmp.h
header-y += socket.h
header-y += sockios.h