AA: uhttpd: fix build error with the new json-c (#13690)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36924 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: rt2x00: remove the clk_get patch, the kernel still uses the old platform_data flag (#13532)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36929 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: odhcp6c: backport r36930

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36931 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: firewall: merge r36933

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36934 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: firewall: merge r36935

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36936 3c298f89-4303-0410-b956-a3cf2f4a3e73
kirkwood: disable the CONFIG_IP_ADVANCED_ROUTER kernel config override (#13702)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r36937

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36938 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: netifd: backport r36950

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36951 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: netifd: backport r36952

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36953 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: base-files: merge r36942

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36961 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: firewall: merge r36960

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36962 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: firewall: merge r36963

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36964 3c298f89-4303-0410-b956-a3cf2f4a3e73
netifd: update to latest version, fixes a NULL pointer deref bug

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

Backport of r36965

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36966 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: odhcp6c: backport r36959

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36970 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: 6relayd: backport r36969

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36971 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: 6relayd: backport r36980

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36981 3c298f89-4303-0410-b956-a3cf2f4a3e73
Merge remote-tracking branch 'upstream/master' into jun2013