TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into for-next

Browse Source 
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
This commit is contained in:
Jiri Kosina
2011-09-15 15:08:05 +02:00
parent 10e4ac572e cc39c6a9bb
commit e060c38434
3980 changed files with 199230 additions and 61613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/eventpoll.c
View File

@@ -37,7 +37,7 @@
#include <asm/system.h>
#include <asm/io.h>
#include <asm/mman.h>
#include <asm/atomic.h>
#include <linux/atomic.h>
/*
* LOCKING: