forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel-stable' into devel

Browse source 
Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig
This commit is contained in:
Russell King 2010-05-17 17:24:04 +01:00
commit ac1d426e82
5500 changed files with 78800 additions and 18040 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-integrator/pci_v3.c
View file

@ -22,7 +22,6 @@
*/
#include <linux/kernel.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/spinlock.h>