Merge branch 'uek-2.6.39-200' of ca-git.us.oracle.com:linux-uek-2.6.39

Merge branch 'uek-2.6.39-200' of ca-git.us.oracle.com:linux-uek-2.6.39

Conflicts:
	block/scsi_ioctl.c
	drivers/hwmon/fam15h_power.c
	drivers/infiniband/ulp/ipoib/ipoib_main.c
	drivers/infiniband/ulp/ipoib/ipoib_multicast.c
	drivers/md/dm-mpath.c
	drivers/net/Kconfig
	drivers/net/Makefile
	drivers/net/hxge/hxge_main.c
	drivers/net/hxge/hxge_txdma.c
	drivers/pci/pcie/aspm.c
	drivers/scsi/sd.c
	include/linux/if_vlan.h
	net/ipv4/route.c
	net/ipv6/route.c
	net/sunrpc/svc.c
	net/sunrpc/svc_xprt.c
	uek-rpm/ol5/kernel-uek.spec
	uek-rpm/ol6/config-generic
	uek-rpm/ol6/kernel-uek.spec

Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>