lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4c1ac1b491
android_kernel_xiaomi_sm8350/drivers/char
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
agp [AGP] Allocate AGP pages with GFP_DMA32 by default 2006-11-22 14:55:29 -08:00
drm WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
hw_random Driver core: change misc class_devices to be real devices 2006-12-01 14:51:59 -08:00
ip2 WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
ipmi [PATCH] ipmi: use platform_device_add() instead of platform_device_register() to register device allocated dynamically 2006-11-16 11:43:37 -08:00
mwave IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
pcmcia WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
rio Fix misc .c/.h comment typos 2006-11-30 05:24:39 +01:00
tpm Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
watchdog Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 2006-12-01 16:47:26 -08:00
.gitignore [MIPS] Remove IT8172-based platforms, ITE 8172G and Globespan IVR support. 2006-10-03 17:59:17 +01:00
amiserial.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
applicom.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
applicom.h
briq_panel.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
cd1865.h
ChangeLog
consolemap.c
cp437.uni
cs5535_gpio.c
cyclades.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
decserial.c
defkeymap.c_shipped
defkeymap.map
digi1.h
digi.h
digiFep1.h
digiPCI.h
ds1286.c [PATCH] proper flags type of spin_lock_irqsave() 2006-10-01 00:39:21 -07:00
ds1302.c
ds1620.c
dsp56k.c
dtlk.c
ec3104_keyb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
efirtc.c
epca.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
epca.h [PATCH] char: kill unneeded memsets 2006-10-04 07:55:13 -07:00
epcaconfig.h
esp.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
generic_nvram.c
generic_serial.c [PATCH] char: kill unneeded memsets 2006-10-04 07:55:13 -07:00
genrtc.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
hangcheck-timer.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hpet.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hvc_console.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hvc_console.h
hvc_iseries.c Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work 2006-10-04 15:02:27 +10:00
hvc_rtas.c
hvc_vio.c
hvcs.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
hvsi.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
i8k.c
ip27-rtc.c
isicom.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
istallion.c [PATCH] trivial iomem annotations: istallion 2006-10-10 15:37:22 -07:00
Kconfig Remove long-unmaintained ftape driver subsystem. 2006-12-03 22:22:41 -05:00
keyboard.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
lcd.c
lcd.h
lp.c [PATCH] There is no devfs, there has never been a devfs, we have always been at war with... 2006-09-29 09:18:10 -07:00
Makefile Remove long-unmaintained ftape driver subsystem. 2006-12-03 22:22:41 -05:00
mbcs.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
mbcs.h
mem.c Driver core: change mem class_devices to be real devices 2006-12-01 14:52:00 -08:00
misc.c Driver core: change misc class_devices to be real devices 2006-12-01 14:51:59 -08:00
mmtimer.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
moxa.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mspec.c [PATCH] mspec driver build fix 2006-11-13 07:40:42 -08:00
mxser.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
mxser.h
n_hdlc.c
n_r3964.c
n_tty.c
nsc_gpio.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
nvram.c
nwbutton.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
nwbutton.h IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
nwflash.c
pc8736x_gpio.c [PATCH] drivers/char/pc8736x_gpio.c: remove unused static functions 2006-09-29 09:18:05 -07:00
ppdev.c Driver core: convert ppdev code to use struct device 2006-12-01 14:52:00 -08:00
pty.c [PATCH] const struct tty_operations 2006-10-02 07:57:14 -07:00
random.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
raw.c Driver core: convert raw device code to use struct device 2006-12-01 14:51:59 -08:00
riscom8_reg.h
riscom8.c Various drivers' irq handlers: kill dead code, needless casts 2006-10-06 15:00:58 -04:00
riscom8.h
rocket_int.h
rocket.c [PATCH] const struct tty_operations 2006-10-02 07:57:14 -07:00
rocket.h
rtc.c [RTC] Consistently use of tabs for formatting. 2006-10-09 23:20:47 +01:00
scan_keyb.c
scan_keyb.h
scc.h
scx200_gpio.c [PATCH] scx200_gpio export cleanups 2006-09-29 09:18:06 -07:00
selection.c [PATCH] tty locking on resize 2006-09-29 09:18:12 -07:00
ser_a2232.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ser_a2232.h
ser_a2232fw.ax
ser_a2232fw.h
serial167.c [PATCH] serial167 __user annotations, NULL noise removal 2006-10-15 11:00:58 -07:00
snsc_event.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
snsc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
snsc.h
sonypi.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
specialix_io8.h
specialix.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
stallion.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sx.c [PATCH] sx: fix user-visible typo (devic) 2006-10-17 08:18:45 -07:00
sx.h
sxboards.h
sxwindow.h
synclink_gt.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
synclink.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
synclinkmp.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
sysrq.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
tb0219.c
tipar.c [PATCH] pr_debug: tipar: repair nonexistant pr_debug argument use 2006-10-03 08:04:19 -07:00
tlclk.c [PATCH] tlclk: fix platform_device_register_simple() error check 2006-11-25 13:28:34 -08:00
toshiba.c
tty_io.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
tty_ioctl.c [PATCH] Fix locking for tty drivers when doing urgent characters 2006-09-29 09:18:24 -07:00
vc_screen.c Driver core: convert vc code to use struct device 2006-12-01 14:51:59 -08:00
viocons.c [POWERPC] Fix viocons for irq breakage 2006-10-07 10:10:27 +10:00
viotape.c
vme_scc.c [PATCH] m68k pt_regs fixes 2006-10-07 10:51:14 -07:00
vr41xx_giu.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
vt_ioctl.c [PATCH] vt: Make vt_pid a struct pid (making it pid wrap around safe). 2006-10-02 07:57:14 -07:00
vt.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00