diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 17:57:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 17:57:28 -0700 |
| commit | f614c8178b0696d070b23f36a2a27b5128f6c372 (patch) | |
| tree | f953fbab722965378a9310c43b4b1c90bfd21eb3 /net/ipv4/ip_options.c | |
| parent | b8ce8d7222b52200e61ea29523993e20751baaaa (diff) | |
| parent | c19edb6946d250db6d4a3dbd6146f7b23bf3468b (diff) | |
Merge branch 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller:
"The patch by Guenter Roeck fixes the build on parisc which got broken
because of commit f24ffde43237 ("parisc: expose number of page table
levels on Kconfig level") and the patch from Matthew Wilcox converts
our code to use the generic scatterlist.h header file"
* 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS
parisc: Eliminate sg_virt_addr() and private scatterlist.h
Diffstat (limited to 'net/ipv4/ip_options.c')
0 files changed, 0 insertions, 0 deletions