q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers
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
..
accessibility
acpi Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2011-05-29 11:19:16 -07:00
amba ARM: 6829/1: amba: make hardcoded periphid override hardware 2011-05-26 10:33:34 +01:00
ata ahci: change 'masking port_map' printk to KERN_WARNING level 2011-06-29 10:10:07 -07:00
atm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2011-05-20 13:43:21 -07:00
auxdisplay
base Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2011-06-28 11:15:36 -07:00
bcma Update my e-mail address 2011-07-07 15:18:01 +02:00
block Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus 2011-06-30 10:10:50 +02:00
bluetooth Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem 2011-06-17 12:40:36 -04:00
cdrom block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal 2011-06-02 05:29:19 +09:00
char Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
clk
clocksource Revert "clocksource: sh_cmt: Runtime PM support" 2011-05-31 15:26:42 +09:00
connector Connector: Correctly set the error code in case of success when dispatching receive callbacks 2011-06-07 12:02:00 -07:00
cpufreq [CPUFREQ] powernow-k8: Don't try to transition if the pstate is incorrect 2011-06-16 16:31:13 -04:00
cpuidle Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 2011-05-29 11:18:09 -07:00
crypto crypto: caam - fix operator precedence in shared descriptor allocation 2011-06-30 07:43:27 +08:00
dca
dio
dma Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
edac treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
eisa
firewire
firmware Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2011-06-28 11:15:36 -07:00
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 HID: hid-multitouch: add support for a new Lumio dual-touch panel 2011-06-24 13:41:11 +02:00
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 gigaset: call module_put before restart of if_open() 2011-06-17 15:27:32 -04:00
leds drivers/leds/leds-pca9532.c: change driver name to be unique 2011-07-08 21:14:44 -07:00
lguest
macintosh Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-05-23 09:12:26 -07:00
mca
md md: avoid endless recovery loop when waiting for fail device to complete. 2011-06-28 16:59:42 +10:00
media Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
memstick
message treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
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 Merge branch 'devicetree/arm-next' of git://git.secretlab.ca/git/linux-2.6 into devel-stable 2011-05-25 00:08:17 +01:00
oprofile oprofile: Fix locking dependency in sync_start() 2011-05-31 16:33:34 +02:00
parisc
parport treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
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 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 2011-05-29 11:44:33 -07:00
pnp treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
power Change Ryan Mallon's email address across the kernel 2011-06-16 11:22:05 +02:00
pps
ps3
ptp ptp: Fix some locking bugs in ptp_read() 2011-06-01 19:29:10 -07:00
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 [S390] qdio: Split SBAL entry flags 2011-06-06 14:14:56 +02:00
sbus
scsi Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
sfi
sh drivers: sh: resume enabled clocks fix 2011-06-14 15:15:25 +09:00
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 treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
usb Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
uwb treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00
vhost vhost: support event index 2011-05-30 11:14:15 +09:30
video Merge branch 'master' into for-next 2011-07-11 14:15:55 +02:00
virtio virtio: add api for delayed callbacks 2011-05-30 11:14:16 +09:30
vlynq
w1 w1: ds1wm: add a reset recovery parameter 2011-07-08 21:14:44 -07:00
watchdog watchdog: update author email for at32ap700x_wdt 2011-06-28 20:01:25 +00:00
xen Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 2011-06-20 09:01:33 -07:00
zorro
Kconfig ptp: Added a brand new class driver for ptp clocks. 2011-05-23 13:01:00 -07:00
Makefile Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2011-05-28 12:35:15 -07:00