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

..

act200l-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

actisys-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

ali-ircc.c

irda: ali-ircc: Fix deadlock in ali_ircc_sir_change_speed()

2015-09-11 16:18:33 -07:00

ali-ircc.h

irda: ali-ircc: Replace timeval with ktime_t

2015-01-11 21:39:40 -05:00

au1k_ir.c

irda: Removed all unused timeval variables

2015-01-11 21:39:40 -05:00

bfin_sir.c

irda: remove deprecated IRQF_DISABLED

2013-10-07 15:53:52 -04:00

bfin_sir.h

net/irda: convert bfin_sir to common Blackfin UART header

2011-05-24 01:13:11 -04:00

bu92725guw.c

newton: update irda bu92747 drivers

2011-10-09 17:52:06 +08:00

bu92725guw.h

newton: update irda bu92747 drivers

2011-10-09 17:52:06 +08:00

donauboe.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

donauboe.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

esi-sir.c

irda: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

girbil-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

ir_serial.c

newton: update irda bu92747 drivers

2011-10-09 17:52:06 +08:00

ir_serial.h

newton: updata irda serial driver

2011-07-28 18:29:52 -07:00

irda-usb.c

irda: irda-usb: use msecs_to_jiffies for conversions

2015-05-25 17:39:21 -04:00

irda-usb.h

irda: irda-usb: Replace timeval with ktime_t

2015-01-11 21:39:40 -05:00

irtty-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

irtty-sir.h

…

Kconfig

drivers/net/irda/Kconfig: Let SH_IRDA depend on HAS_IOMEM

2014-10-03 15:52:04 -07:00

kingsun-sir.c

irda: Removed all unused timeval variables

2015-01-11 21:39:40 -05:00

ks959-sir.c

irda: Removed all unused timeval variables

2015-01-11 21:39:40 -05:00

ksdazzle-sir.c

drivers/net: delete non-required instances of include <linux/init.h>

2014-01-16 11:53:26 -08:00

litelink-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

ma600-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

Makefile

net: irda: ep7211-sir: Remove driver

2014-02-06 19:54:48 -08:00

mcp2120-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

mcs7780.c

irda: Removed all unused timeval variables

2015-01-11 21:39:40 -05:00

mcs7780.h

irda: Removed all unused timeval variables

2015-01-11 21:39:40 -05:00

nsc-ircc.c

irda: nsc-ircc: Replace timeval with ktime_t

2015-01-11 21:39:40 -05:00

nsc-ircc.h

irda: nsc-ircc: Replace timeval with ktime_t

2015-01-11 21:39:40 -05:00

old_belkin-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

pxaficp_ir.c

net: irda: pxaficp_ir: dmaengine conversion

2015-09-28 22:32:48 -07:00

rk29_ir.c

newton: add irda serial driver

2011-07-17 02:17:50 -07:00

rk29_ir.h

newton: add irda serial driver

2011-07-17 02:17:50 -07:00

sa1100_ir.c

arm: sa1100: move irda header to linux/platform_data

2014-12-30 18:44:07 -05:00

sh_irda.c

irda: sh_irda: use devm_request_irq()

2014-01-09 22:57:13 -05:00

sh_sir.c

irda: sh_sir: Use cpufreq_for_each_valid_entry macro for iteration

2014-04-30 00:06:54 +02:00

sir_dev.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

sir_dongle.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

sir-dev.h

irda: Remove extern from function prototypes

2013-09-24 12:54:17 -07:00

smsc-ircc2.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

smsc-ircc2.h

irda: Fix FSF address in file headers

2013-12-06 12:37:55 -05:00

smsc-sio.h

…

stir4200.c

irda: stir4200: Replace timeval with ktime_t

2015-01-11 21:39:40 -05:00

tekram-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

toim3232-sir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

via-ircc.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

via-ircc.h

irda: Removed all unused timeval variables

2015-01-11 21:39:40 -05:00

vlsi_ir.c

irda: vlsi_ir: Replace timeval with ktime_t

2015-01-11 21:39:40 -05:00

vlsi_ir.h

irda: vlsi_ir: Replace timeval with ktime_t

2015-01-11 21:39:40 -05:00

w83977af_ir.c

irda: Convert IRDA_DEBUG to pr_debug

2014-11-12 13:56:41 -05:00

w83977af_ir.h

irda: convert to internal stats

2009-01-06 10:40:43 -08:00

w83977af.h

…