David S. Miller 6332178d91 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ppp_generic.c		2008-12-23 17:56:23 -08:00
..
core.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-12-23 17:56:23 -08:00
Kconfig
Makefile
sock.c	bluetooth: Fix unused var warning properly in rfcomm_sock_ioctl().	2008-12-09 01:04:27 -08:00
tty.c	bt/rfcomm/tty: join error paths	2008-12-14 23:18:00 -08:00