p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/staging
History
Jiri Kosina 9b42f06517 trivial: don't touch files that are removed in the staging tree 
This is a partial revert of e44ba033c5 ("treewide: remove duplicate
includes") and 28f65c11f2 ("treewide: Convert uses of struct resource
to resource_size(ptr)") as the files in question have been removed in
staging tree, so get rid of the conflict.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 		2011-07-20 11:59:21 +02:00
..
altera-stapl Staging: altera: move .h file to proper place 2011-06-07 12:19:14 -07:00
asus_oled
…
ath6kl treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
bcm treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
brcm80211 Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
comedi Staging: comedi: fix build breakages on some platforms 2011-06-27 14:43:34 -07:00
cptm1217 drivers/staging/cptm1217/clearpad_tm1217.c: Correct call to input_free_device 2011-05-18 14:30:49 -07:00
crystalhd staging: Remove unnecessary semicolons when switch (foo) {...}; 2011-04-25 16:58:35 -07:00
cs5535_gpio
…
cx25821 staging: Remove unnecessary semicolons when switch (foo) {...}; 2011-04-25 16:58:35 -07:00
cxd2099
…
cxt1e1 Fix common misspellings 2011-03-31 11:26:23 -03:00
dt3155v4l
…
easycap staging/easycap: easycap_probe: drop more unused variables 2011-05-18 14:30:08 -07:00
echo staging: echo: Trivial indentation changes 2011-05-17 13:31:29 -07:00
et131x Fix common misspellings 2011-03-31 11:26:23 -03:00
frontier
…
ft1000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 2011-05-24 13:28:35 -07:00
generic_serial trivial: don't touch files that are removed in the staging tree 2011-07-20 11:59:21 +02:00
gma500 gma500: push through device driver tree 2011-06-29 00:44:39 +02:00
go7007 Fix common misspellings 2011-03-31 11:26:23 -03:00
hv treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
iio Staging: iio: Make IIO depend on GENERIC_HARDIRQS 2011-06-27 14:19:21 -07:00
intel_sst Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-05-23 12:49:28 -07:00
keucr staging/keucr: fix transport other code style 2011-05-18 08:22:41 -07:00
line6 drivers/staging/line6/driver.c: Drop unneeded put functions. 2011-05-17 13:31:32 -07:00
lirc [media] [staging] lirc_serial: allocate irq at init time 2011-07-01 16:32:45 -03:00
mei Staging: mei: fix suspend failure 2011-06-27 14:19:21 -07:00
msm Fix common misspellings 2011-03-31 11:26:23 -03:00
nvec treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
octeon staging: octeon-ethernet: remove .get_sg, etc. ethtool_ops 2011-04-25 17:26:19 -07:00
olpc_dcon staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE 2011-06-07 12:28:39 -07:00
panel
…
phison
…
pohmelfs sanitize <linux/prefetch.h> usage 2011-05-20 12:50:29 -07:00
quatech_usb2 Fix common misspellings 2011-03-31 11:26:23 -03:00
quickstart
…
rtl8187se Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8192e Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8192u Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-04-07 11:36:44 -07:00
rtl8712 treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
rts_pstor staging: rts_pstor: use bitwise operator instead of logical one 2011-06-07 12:28:40 -07:00
sbe-2t3e3 Staging: sbe-2t3e3: redundant null check before kfree() 2011-04-20 13:45:57 -07:00
sep treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
serqt_usb2
…
slicoss Fix common misspellings 2011-03-31 11:26:23 -03:00
sm7xx Staging: sm7xx: printk loglevels modified to match the scenario 2011-05-19 15:34:32 -07:00
solo6x10 staging: solo6x10: add select SND_PCM to fix build error 2011-04-25 17:44:09 -07:00
speakup Fix common misspellings 2011-03-31 11:26:23 -03:00
spectra Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
ste_rmi4 Fix common misspellings 2011-03-31 11:26:23 -03:00
tidspbridge Revert wrong fixes for common misspellings 2011-04-26 23:31:11 -07:00
tm6000 [media] tm6000: fix uninitialized field, change prink to dprintk 2011-05-21 07:24:19 -03:00
tty Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-05-23 12:49:28 -07:00
usbip treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
vme Fix common misspellings 2011-03-31 11:26:23 -03:00
vt6655 staging: vt6655: Fix warnings if CONFIG_PM is not defined 2011-05-06 09:27:34 -07:00
vt6656 drivers/staging/vt6656/main_usb.c: Delete unnecessary call to usb_kill_urb 2011-05-17 11:37:57 -07:00
westbridge trivial: don't touch files that are removed in the staging tree 2011-07-20 11:59:21 +02:00
winbond Staging: winbond: wb35tx.c: Fixed coding style 2011-04-20 13:48:25 -07:00
wlags49_h2 staging: pcmcia: Convert pcmcia_device_id declarations to const 2011-05-06 07:47:02 +02:00
wlags49_h25 Fix common misspellings 2011-03-31 11:26:23 -03:00
wlan-ng Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-05-24 16:47:54 -04:00
xgifb Staging: xgifb: Fixed style issues. 2011-04-26 15:46:28 -07:00
zcache vmscan: change shrinker API by passing shrink_control struct 2011-05-25 08:39:26 -07:00
zram
…
Kconfig Staging: remove STAGING_EXCLUDE_BUILD option 2011-06-07 12:23:57 -07:00
Makefile Staging: initial version of the nvec driver 2011-05-19 15:36:10 -07:00
staging.c
…