Merge branch 'master' into hpc2

Conflicts:

	drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <[email protected]>

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc drivers/Makefile
index 6a3ea5da255e8392740ce61ca6ac4a94715000cf,fffc22a5e1d72451739d67ffe17ba3df105c3fb1..60ce3b489cc32c41b314127abe60f3d4fb2a6c2a
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -44,8 -44,8 +44,8 @@@ COBJS = 3c589.o 5701rls.o ali512x.o atm
          serial.o serial_max3100.o \
          serial_pl010.o serial_pl011.o serial_xuartlite.o \
          sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
-         status_led.o sym53c8xx.o ahci.o \
+         status_led.o sym53c8xx.o systemace.o ahci.o \
 -        ti_pci1410a.o tigon3.o tsec.o \
 +        ti_pci1410a.o tigon3.o tsec.o tsi108_eth.o\
          usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
          videomodes.o w83c553f.o \
          ks8695eth.o \