diff options
author | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 14:42:02 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 14:42:02 +0100 |
commit | a02001086bbfb4da35d1228bebc2f1b442db455f (patch) | |
tree | 62ab47936cef06fd08657ca5b6cd1df98c19be57 /drivers/staging/bcm/headers.h | |
parent | kernel: trace: fix printk message (diff) | |
parent | Linux 3.18-rc5 (diff) | |
download | linux-dev-a02001086bbfb4da35d1228bebc2f1b442db455f.tar.xz linux-dev-a02001086bbfb4da35d1228bebc2f1b442db455f.zip |
Merge Linus' tree to be be to apply submitted patches to newer code than
current trivial.git base
Diffstat (limited to 'drivers/staging/bcm/headers.h')
-rw-r--r-- | drivers/staging/bcm/headers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/bcm/headers.h b/drivers/staging/bcm/headers.h index 6f3270cc4176..a7d4af5ea9a7 100644 --- a/drivers/staging/bcm/headers.h +++ b/drivers/staging/bcm/headers.h @@ -1,6 +1,6 @@ /******************************************************************* -* Headers.h +* Headers.h *******************************************************************/ #ifndef __HEADERS_H__ #define __HEADERS_H__ |