Huang, Tao bbf44583ac Merge branch 'torvalds/master' ...

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Conflicts:
	arch/arm/include/asm/arm-cci.h
	drivers/android/binder.c
	drivers/android/binder_trace.h
	drivers/block/zram/Kconfig
	drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h
	include/kvm/arm_arch_timer.h
	include/linux/pl320-ipc.h
	include/linux/zsmalloc.h
	include/uapi/linux/android/binder.h

2015-11-11 19:52:00 +08:00

..

.gitignore

rk: temp revert rk change

2013-11-08 21:33:42 +08:00

clut_vga16.ppm

…

Kconfig

x86, platforms: Remove SGI Visual Workstation

2014-02-27 08:07:39 -08:00

logo_android_bmp.bmp

rk fb: fix bmp logo support

2013-03-20 16:43:14 +08:00

logo_blackfin_clut224.ppm

video/logo: add support for Blackfin/Linux logo for framebuffer console

2008-05-14 19:11:14 -07:00

logo_blackfin_vga16.ppm

video/logo: add support for Blackfin/Linux logo for framebuffer console

2008-05-14 19:11:14 -07:00

logo_charger00_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger01_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger02_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger03_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger04_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger05_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger06_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger07_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_charger08_clut224.ppm

Revert "td8801:add charger display for phone"

2012-02-13 10:42:18 +08:00

logo_dec_clut224.ppm

…

logo_g3_clut224.ppm

add G3 logo & change td8801 config with g3 logo

2011-12-28 10:41:20 +08:00

logo_linux_800x480_clut224.ppm

rk2928: use 800x480 linux logo as default logo for factory tool

2012-10-18 21:02:51 +08:00

logo_linux_clut224.ppm

Bye, bye, WfW flag

2013-09-11 19:55:12 -07:00

logo_linux_lowerpower_clut224.ppm

show the lowerpower picture , battery lower-power when start up

2013-03-11 16:50:02 +08:00

logo_linux_mono.pbm

…

logo_linux_vga16.ppm

Revert "linux.conf.au 2009: Tuz"

2009-04-27 12:00:27 -07:00

logo_m32r_clut224.ppm

…

logo_mac_clut224.ppm

…

logo_parisc_clut224.ppm

…

logo_pipo_clut224.ppm

rk3188 ds1006h: do not use logo from customer, the sdk uses default

2013-02-25 14:09:23 +08:00

logo_sgi_clut224.ppm

…

logo_spe_clut224.ppm

…

logo_sun_clut224.ppm

…

logo_sunset_bmp.bmp

rkfb:add bmp logo support

2012-09-18 17:37:26 +08:00

logo_superh_clut224.ppm

…

logo_superh_mono.pbm

…

logo_superh_vga16.ppm

…

logo.c

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

Makefile

rk: temp revert rk change

2013-11-08 21:33:42 +08:00