tree 46e93126170d02cfec9505172e545732c1b69656
parent a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d
parent 5b664cb235e97afbf34db9c4d77f08ebd725335e
author David S. Miller <davem@davemloft.net> 1216373979 -0700
committer David S. Miller <davem@davemloft.net> 1216373979 -0700

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

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c