Linus Torvalds a4c12d6c5d Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (353 commits) [IPV6] ADDRCONF: Mobile IPv6 Home Address support. [IPV6] ADDRCONF: Allow non-DAD'able addresses. [IPV6] NDISC: Fix is_router flag setting. [IPV6] ADDRCONF: Convert addrconf_lock to RCU. [IPV6] NDISC: Add proxy_ndp sysctl. [IPV6] NDISC: Set per-entry is_router flag in Proxy NA. [IPV6] NDISC: Avoid updating neighbor cache for proxied address in receiving NA. [IPV6]: Don't forward packets to proxied link-local address. [IPV6] NDISC: Handle NDP messages to proxied addresses. [NETFILTER]: PPTP conntrack: fix another GRE keymap leak [NETFILTER]: PPTP conntrack: fix GRE keymap leak [NETFILTER]: PPTP conntrack: fix PPTP_IN_CALL message types [NETFILTER]: PPTP conntrack: check call ID before changing state [NETFILTER]: PPTP conntrack: clean up debugging cruft [NETFILTER]: PPTP conntrack: consolidate header parsing [NETFILTER]: PPTP conntrack: consolidate header size checks [NETFILTER]: PPTP conntrack: simplify expectation handling [NETFILTER]: PPTP conntrack: remove unnecessary cid/pcid header pointers [NETFILTER]: PPTP conntrack: fix header definitions [NETFILTER]: PPTP conntrack: remove more dead code ...		2006-09-23 16:49:31 -07:00
..
acorn
acpi	Merge trivial low-risk suspend hotkey bugzilla-5918 into release	2006-08-20 21:49:29 -04:00
amba
atm	[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE	2006-09-22 14:53:53 -07:00
base	[S390] hypfs comment cleanup.	2006-09-20 15:58:44 +02:00
block	[BLOCK] cryptoloop: Use block ciphers where applicable	2006-09-21 11:45:53 +10:00
bluetooth	[Bluetooth] Enable SCO support for Broadcom HID proxy dongle	2006-07-24 12:44:34 -07:00
cdrom	[PATCH] cdrom/gdsc: fix printk format warning	2006-08-27 11:01:33 -07:00
char	[PATCH] briq_panel: read() and write() get __user pointers, damnit	2006-09-23 11:34:43 -07:00
clocksource
connector	[PATCH] Process Events: Fix biarch compatibility issue. use __u64 timestamp	2006-07-31 13:28:36 -07:00
cpufreq	[CPUFREQ] Fix some more CPU hotplug locking.	2006-09-22 19:15:23 -04:00
crypto	[CRYPTO] padlock: Convert padlock-sha to use crypto_hash	2006-09-21 11:46:22 +10:00
dio
dma	[I/OAT]: Remove pci_module_init() from Intel I/OAT DMA engine	2006-07-21 14:50:13 -07:00
edac	[PATCH] drivers/edac/edac_mc.h must #include <linux/platform_device.h>	2006-08-06 08:57:46 -07:00
eisa
fc4
firmware
hwmon	[PATCH] hwmon: abituguru timeout fixes	2006-08-26 13:05:19 -07:00
i2c	Merge branch 'merge'	2006-08-31 15:45:48 +10:00
ide	[POWERPC] Fix ohare IDE irq workaround on old powermacs	2006-09-22 15:19:58 +10:00
ieee1394	[PATCH] 1394: fix for recently added firewire patch that breaks things on ppc	2006-08-27 11:01:28 -07:00
infiniband	[PATCH] missing includes from infiniband merge	2006-09-23 11:34:43 -07:00
input	Input: psmouse - fix Intellimouse 4.0 initialization	2006-08-23 00:48:03 -04:00
isdn	[PATCH] eicon: fix define conflict with ptrace	2006-08-06 08:57:48 -07:00
leds
macintosh	[PATCH] asm/backlight.h is ppc-only	2006-09-22 17:48:57 -07:00
mca
md	[BLOCK] dm-crypt: trivial comment improvements	2006-09-21 11:46:27 +10:00
media	V4L/DVB (4608c): Fix I2C dependencies for saa7146 modules	2006-09-10 13:46:01 -03:00
message	[SCSI] mptfc: correct out of order event processing	2006-08-06 15:48:31 -05:00
mfd
misc
mmc	[MMC] Always use a sector size of 512 bytes	2006-09-07 16:01:30 +01:00
mtd	Revert "[MTD] blkdev helper code: fix printk format warning"	2006-09-22 11:05:42 +01:00
net	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2006-09-23 16:49:31 -07:00
nubus
oprofile
parisc
parport
pci	Merge branch 'linux-2.6'	2006-09-14 07:07:18 +10:00
pcmcia	[PATCH] pcmcia: fix ioctl GET_CONFIGURATION_INFO for pcmcia_cards	2006-07-31 13:28:41 -07:00
pnp	[PATCH] pnpacpi: reject ACPI_PRODUCER resources	2006-08-06 08:57:49 -07:00
rapidio
rtc	[PATCH] rtc-s3c.c: fix time setting checks	2006-08-27 11:01:28 -07:00
s390	[S390] cio: subchannel evaluation function operates without lock	2006-09-20 16:00:01 +02:00
sbus	[OPENPROMIO]: Handle current_node being NULL correctly.	2006-09-18 01:47:13 -07:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2006-09-22 12:51:33 -07:00
serial	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-09-22 12:48:03 -07:00
sh
sn
spi
tc
telephony
usb	[PATCH] fallout from hcd-core patch	2006-09-22 17:48:57 -07:00
video	[PATCH] more get_property() fallout	2006-09-23 11:34:43 -07:00
w1
zorro
Kconfig
Makefile