diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-28 14:22:17 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-28 14:22:17 +0300 |
| commit | d6d41ba1cb38d3e9575462b12f22b9f0b360bc1d (patch) | |
| tree | 6d0a417fc9de09e63a4ac9f8c4d0aff64768b88e /include/linux/kernel.h | |
| parent | 1ef24960ab78554fe7e8e77d8fc86524fbd60d3c (diff) | |
| parent | f7e87a44ef60ad379e39b45437604141453bf0ec (diff) | |
| download | linux-d6d41ba1cb38d3e9575462b12f22b9f0b360bc1d.tar.xz | |
Merge remote-tracking branch 'linus/master' into patchwork
Merge back media fixes applied upstream.
* linus/master: (457 commits)
Linux 3.18-rc2
ARM: dts: imx28-evk: Let i2c0 run at 100kHz
ARM: i.MX6: Fix "emi" clock name typo
overlayfs: embed middle into overlay_readdir_data
overlayfs: embed root into overlay_readdir_data
overlayfs: make ovl_cache_entry->name an array instead of pointer
overlayfs: don't hold ->i_mutex over opening the real directory
arm64: Fix memblock current_limit with 64K pages and 48-bit VA
sparc64: Implement __get_user_pages_fast().
sparc64: Fix register corruption in top-most kernel stack frame during boot.
arm64: ASLR: Don't randomise text when randomise_va_space == 0
[media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr
[media] s5p-fimc: Only build suspend/resume for PM
[media] s5p-jpeg: Only build suspend/resume for PM
[media] Remove references to non-existent PLAT_S5P symbol
MIPS: SEAD3: Fix I2C device registration.
[media] videobuf-dma-contig: set vm_pgoff to be zero to pass the sanity check in vm_iomap_memory()
[media] tw68: remove bogus I2C_ALGOBIT dependency
kvm: vfio: fix unregister kvm_device_ops of vfio
KVM: x86: Wrong assertion on paging_tmpl.h
...
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 40728cf1c452..3d770f5564b8 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -403,6 +403,7 @@ int vsscanf(const char *, const char *, va_list); extern int get_option(char **str, int *pint); extern char *get_options(const char *str, int nints, int *ints); extern unsigned long long memparse(const char *ptr, char **retptr); +extern bool parse_option_str(const char *str, const char *option); extern int core_kernel_text(unsigned long addr); extern int core_kernel_data(unsigned long addr); |