add gbox_v2.1_defconfig
add gbox_v2.3_defconfig
gbox configs: change kernel repo to MakaLabs/staging
gbox config: update v2.1/2.2 config file name
[temp] Revert "gbox config: update v2.1/2.2 config file name"

This reverts commit c49720d430d60f19b26e87f0c89111ddddaff818.

The feature branch will be reset later and this and the reverted commit will be removed.
[temp] Revert "gbox configs: change kernel repo to MakaLabs/staging"

This reverts commit c313713358bb1b71b785ad569ef2ba0af6eb31de.

The feature branch will be reset later and this and the reverted commit will be removed.
[temp] Revert "add gbox_v2.3_defconfig"

This reverts commit 4b8ad4c6017a629659cc8a2fa66daef7cecdc2e0.

4b8ad4c6017a629659cc8a2fa66daef7cecdc2e0
[temp] Revert "add gbox_v2.1_defconfig"

This reverts commit 83af115c61ca9a4a46ccf6efcab8d1d8d3c7a531.

The feature branch will be reset later and this and the reverted commit will be removed.
add gbox_defconfig
gbox config: change kernel repo to MakaLabs/staging
Fixed URL
New kernel configs
Minor changes
Kernel updates
Kernel changes
Merge branch 'master' into 2013.11-Amlogic_Gotham

Conflicts:
	package/thirdparty/xbmcaddons/nm/nm.mk