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
..
accessibility
acpi
amba
ata
atm
auxdisplay
base
bcma	Update my e-mail address	2011-07-07 15:18:01 +02:00
block
bluetooth
cdrom
char	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
clk
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
edac
eisa
firewire
firmware
gpio	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
gpu	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
hid
hwmon	hwmon: (pmbus) Improve auto-detection of temperature status register	2011-07-10 08:54:29 -07:00
hwspinlock
i2c	doc: Kconfig: Typo: square -> squared	2011-07-11 14:22:32 +02:00
ide	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
idle
ieee802154
infiniband	RDMA: Check for NULL mode in .devnode methods	2011-07-04 15:53:28 -07:00
input	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
isdn
leds	drivers/leds/leds-pca9532.c: change driver name to be unique	2011-07-08 21:14:44 -07:00
lguest
macintosh
mca
md
media	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
memstick
message
mfd	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
misc	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
mmc	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
mtd	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
net	drivers/net: static should be at beginning of declaration	2011-07-11 14:16:25 +02:00
nfc
nubus
of
oprofile
parisc
parport
pci	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
pcmcia	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
platform
pnp
power
pps
ps3
ptp
rapidio
regulator	regulator: max8997: Fix setting inappropriate value for ramp_delay variable	2011-07-08 19:14:58 +01:00
rtc	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
s390
sbus
scsi	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
sfi
sh
sn
spi	spi/s3c64xx: Bug fix for SPI with different FIFO level	2011-07-06 15:03:08 +09:00
ssb	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
staging	trivial: don't touch files that are removed in the staging tree	2011-07-20 11:59:21 +02:00
target	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
tc
telephony
thermal
tty	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
uio
usb	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
uwb
vhost
video	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
virtio
vlynq
w1	w1: ds1wm: add a reset recovery parameter	2011-07-08 21:14:44 -07:00
watchdog
xen
zorro
Kconfig
Makefile