apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-next' into for-linus

Browse Source 
Conflicts:

	kernel/irq/chip.c
This commit is contained in:
Jiri Kosina
2009-12-07 18:36:35 +01:00
parent 6ec22f9b03 6070d81eb5
commit d014d04386
490 changed files with 721 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/asm-generic/memory_model.h
+1 -1
View File
@@ -47,7 +47,7 @@
#elif defined(CONFIG_SPARSEMEM_VMEMMAP)
/* memmap is virtually contigious. */
/* memmap is virtually contiguous. */
#define __pfn_to_page(pfn) (vmemmap + (pfn))
#define __page_to_pfn(page) (unsigned long)((page) - vmemmap)
include/asm-generic/unistd.h
+1 -1
View File
@@ -631,7 +631,7 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
* these are provided for both review and as a porting
* help for the C library version.
*
* Last chance: are any of these important enought to
* Last chance: are any of these important enough to
* enable by default?
*/
#ifdef __ARCH_WANT_SYSCALL_NO_AT