diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-09-22 22:54:56 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-22 22:54:56 +1000 |
| commit | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch) | |
| tree | aa0e546b39fa4d0a434919ff106721dfc3777a3d /include/linux/kernel.h | |
| parent | 6f98e892884c32b9273ecce1332b849bcad3b8b1 (diff) | |
| parent | d1ac5540455c3a2a11e943e19e2dc044cebe147d (diff) | |
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
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 4c52907a6d8b..89a0b8e5a952 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -500,6 +500,7 @@ static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) extern int hex_to_bin(char ch); extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); +extern char *bin2hex(char *dst, const void *src, size_t count); int mac_pton(const char *s, u8 *mac); |