Chia-chi Yeh 60df157728 net: add PPP on PPTP Network Server (PPPoPNS) driver. ...

Signed-off-by: Chia-chi Yeh <chiachi@android.com>

ppopns: dont include px_proto define in if_pppopns.h

Change-Id: I27e687667db5b45182562f4a517a2e6cec6b1350
Signed-off-by: Dima Zavin <dima@android.com>

2011-06-14 09:09:14 -07:00

..

acpi

Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold', 'ec-asus' and 'thermal-fix' into release

2011-05-29 04:38:48 -04:00

asm-generic

asm-generic/unistd.h: support sendmmsg syscall

2011-06-02 14:31:38 -04:00

crypto

crypto: padlock - Move padlock.h into include/crypto

2011-01-07 14:52:00 +11:00

drm

Merge branch 'drm-radeon-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2011-06-07 19:09:17 -07:00

keys

libceph: Create a new key type "ceph".

2011-03-29 12:11:24 -07:00

linux

net: add PPP on PPTP Network Server (PPPoPNS) driver.

2011-06-14 09:09:14 -07:00

math-emu

math-emu: correct test for downshifting fraction in _FP_FROM_INT()

2010-07-20 18:45:14 -07:00

media

[media] v4l: Fix media_entity_to_video_device macro argument name

2011-06-01 09:42:03 -03:00

mtd

UBI: fix minor stylistic issues

2011-04-14 11:34:41 +03:00

net

net: socket ioctl to reset connections matching local address

2011-06-14 09:08:47 -07:00

pcmcia

pcmcia: Make declaration and uses of struct pcmcia_device_id const

2011-05-06 07:46:15 +02:00

rdma

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

2011-05-26 12:13:57 -07:00

rxrpc

Fix common misspellings

2011-03-31 11:26:23 -03:00

scsi

[SCSI] libsas: Add option for SATA soft reset

2011-05-26 22:49:33 -05:00

sound

Merge branch 'topic/asoc' into for-linus

2011-05-22 10:01:33 +02:00

target

[SCSI] target: Convert REPORT_LUNs to use int_to_scsilun

2011-05-24 13:02:42 -04:00

trace

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

2011-06-04 23:16:00 +09:00

video

Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

2011-05-24 15:49:57 +09:00

xen

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem

2011-05-26 10:50:56 -07:00

Kbuild

…