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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source 
Conflicts:
	drivers/net/smsc911x.c
This commit is contained in:
David S. Miller 2011-04-11 13:44:25 -07:00
commit 1c01a80cfe
2765 changed files with 7223 additions and 8041 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/socket.c
View file

@ -2986,7 +2986,7 @@ out:
/* Since old style bridge ioctl's endup using SIOCDEVPRIVATE
* for some operations; this forces use of the newer bridge-utils that
* use compatiable ioctls
* use compatible ioctls
*/
static int old_bridge_ioctl(compat_ulong_t __user *argp)
{