lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	drivers/macintosh/adbhid.c
This commit is contained in:
Dmitry Torokhov
2007-10-12 21:27:47 -04:00
parent b11d2127c4 2b9e0aae1d
commit b981d8b3f5
7628 changed files with 537075 additions and 239356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/input/keyboard/gpio_keys.c
View File

@@ -22,7 +22,6 @@
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/irq.h>
#include <linux/gpio_keys.h>
#include <asm/gpio.h>