merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36

Conflicts:
	arch/arm/mm/proc-v7.S
	drivers/video/tegra/dc/dc.c

Change-Id: I40be0d615f14f1c01305388a706d257f624ba968

diff --cc drivers/net/wireless/bcm4329/dhd.h
Simple merge

diff --cc drivers/net/wireless/bcm4329/dhd_linux.c
Simple merge

diff --cc drivers/video/tegra/dc/dc.c
Simple merge

diff --cc drivers/video/tegra/dc/nvhdcp.c
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge