diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 08:33:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 08:35:04 -0400 |
| commit | 8cef081c71dd4e16a01a1e63cedab21eef8b5735 (patch) | |
| tree | b5b0fb5ab09dc60dee5fc8fd8e980359abbd1b1e /include/linux/miscdevice.h | |
| parent | 3d55c29fb24286f350f04021bef2dd799e25dd20 (diff) | |
| parent | 9161c3b796a2841a9a7be3d9c9dd121269ce90e8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes
The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/miscdevice.h')
| -rw-r--r-- | include/linux/miscdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 0549d2115507..e0deeb2cc939 100644 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #define MPT_MINOR 220 | 35 | #define MPT_MINOR 220 |
| 36 | #define MPT2SAS_MINOR 221 | 36 | #define MPT2SAS_MINOR 221 |
| 37 | #define UINPUT_MINOR 223 | 37 | #define UINPUT_MINOR 223 |
| 38 | #define MISC_MCELOG_MINOR 227 | ||
| 38 | #define HPET_MINOR 228 | 39 | #define HPET_MINOR 228 |
| 39 | #define FUSE_MINOR 229 | 40 | #define FUSE_MINOR 229 |
| 40 | #define KVM_MINOR 232 | 41 | #define KVM_MINOR 232 |