Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.421' of git://codeaurora.org/kernel/msm into cm-10.1

Conflicts:
	include/media/msm_camera.h

Change-Id: Iee93f272f6023b7848c1ad8ed4f1f7c4ba61d1c5

Conflicts:
	drivers/char/msm_rotator.c
msm-camera: Removing MSM_GMN_IOCTL_TEST_DUMP_REGION ioctl

Removing the MSM_GMN_IOCTL_TEST_DUMP_REGION call because this
is not used.

Change-Id: I26975295f4d8106fdb8894afa4491fb90ca54288
CRs-Fixed: 496905
Merge branch 'linux-3.4.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into cm-10.1

Conflicts:
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/mgmt.h
	net/bluetooth/hci_core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/mgmt.c

Change-Id: I359e121131719563c5f35f67b7eaf3228ccf13c5
net: bcmdhd: update to version 1.61.56 from jf tree

Change-Id: I0a95e838d85900a2cf4ed0f36e68848b628105cd
defconfigs: use a commonized defconfig for d2

Change-Id: Ieebb1fbf7bca2480257cf6477f62a4844aa54066
d2: add support for variant defconfigs

* shamelessly kanged from jf

Change-Id: I86a538f16bbb91dcc9366ed42a35a6451500403d
defconfigs: fix up for selinux dependencies

Change-Id: Ideccb992ebe87d9531bba41239f5bd309103d130
Some de-moronization of stupid ass merge commits