Merge branch 'linus' into oprofile-v2

Conflicts:
	arch/x86/kernel/apic_32.c
	arch/x86/oprofile/nmi_int.c
	include/linux/pci_ids.h

1 files changed, 6 insertions, 1 deletions

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 950af631e7fb..20fc4bbfca42 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -189,7 +189,9 @@ struct ucred {
 #define AF_BLUETOOTH    31      /* Bluetooth sockets            */
 #define AF_IUCV         32      /* IUCV sockets                 */
 #define AF_RXRPC        33      /* RxRPC sockets                */
-#define AF_MAX          34      /* For now.. */
+#define AF_ISDN         34      /* mISDN sockets                */
+#define AF_PHONET       35      /* Phonet sockets               */
+#define AF_MAX          36      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC       AF_UNSPEC
@@ -225,6 +227,8 @@ struct ucred {
 #define PF_BLUETOOTH    AF_BLUETOOTH
 #define PF_IUCV         AF_IUCV
 #define PF_RXRPC        AF_RXRPC
+#define PF_ISDN         AF_ISDN
+#define PF_PHONET       AF_PHONET
 #define PF_MAX          AF_MAX
 
 /* Maximum queue length specifiable by listen.  */
@@ -293,6 +297,7 @@ struct ucred {
 #define SOL_RXRPC       272
 #define SOL_PPPOL2TP    273
 #define SOL_BLUETOOTH   274
+#define SOL_PNPIPE      275
 
 /* IPX options */
 #define IPX_TYPE        1