Merge remote-tracking branch 'x86/kitkat-x86' into marshmallow-x86

Conflicts:
	boot/boot/grub/grub.cfg
	initrd/scripts/0-auto-detect
	install/scripts/1-install

diff --cc Android.mk
Simple merge

diff --cc initrd/scripts/0-auto-detect
index ed771dc,ad77758..b28804e
--- 1/initrd/scripts/0-auto-detect
--- 2/initrd/scripts/0-auto-detect
+++ b/initrd/scripts/0-auto-detect
@@@ -20,28 -20,22 +20,9 @@@ auto_detect(
        cat /sys/devices/virtual/wmi/*/modalias | dev2mod
  }
  
- find_network_dev_name()
 -load_uvesafb()
--{
-       INITRC=init.x86.rc
-       DHCPCD="/system/bin/dhcpcd -o domain_name_servers"
-       rmline=`grep -n "#REMOVE FROM HERE" $INITRC | cut -d':' -f1`
-       rmline=`expr $rmline + 1`
-       sed -i -e "$rmline,\$d" $INITRC
-       for netdev in `ls /sys/class/net`; do
-               case "$netdev" in
-                       lo|ip6tnl*|sit*|tun*|eth0|wlan0|wmaster*)
-                               ;;
-                       *)
-                               echo -e "\nservice dhcpcd_$netdev $DHCPCD -ABDKL\n    class main\n    disabled\n    oneshot\n" >> $INITRC
-                               echo -e "service iprenew_$netdev $DHCPCD -n\n    class main\n    disabled\n    oneshot" >> $INITRC
-                               ;;
-               esac
-       done
 -      [ -x /sbin/v86d ] || ln -s ../android/sbin/v86d /sbin
 -      [ -c /dev/fb0 ] || modprobe uvesafb mode_option=${UVESA_MODE:-800x600}-16 ${UVESA_OPTION:-mtrr=3 scroll=redraw}
--}
--
  load_modules()
  {
 -      if [ -n "$FOUND" ]; then
 -              [ -n "$PREDEV" ] && modprobe $PREDEV
 -              [ -n "$FB0DEV" -a -z "$UVESA_MODE" ] && modprobe $FB0DEV
 -              [ -n "$LANDEV" ] && modprobe $LANDEV
 -              [ -n "$WIFDEV" ] && modprobe $WIFDEV
 -              [ -n "$SNDDEV" ] && modprobe $SNDDEV
 -              [ -n "$CAMDEV" ] && modprobe $CAMDEV
 -      else
 +      if [ -z "$FOUND" ]; then
                auto_detect
        fi
  

diff --cc install/scripts/1-install
Simple merge