diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 13:55:59 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 13:55:59 -0800 |
commit | c1226ff9af84dfa6ef73d95435748569c99b5171 (patch) | |
tree | 794411d5da7c34abafe0e188e499cd8334492ce6 /Makefile | |
parent | 51f29d44414521cc4244958f2a384bcd39d23a6e (diff) | |
parent | c8d4bafe503ca767bbc8f3c54e4acd344ef26346 (diff) | |
download | talos-op-linux-c1226ff9af84dfa6ef73d95435748569c99b5171.tar.gz talos-op-linux-c1226ff9af84dfa6ef73d95435748569c99b5171.zip |
Merge tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
From Tony Lindgren:
Few fixes for v3.9 merge window that are not urgent for
the -rc series.
* tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: using strlcpy instead of strncpy
ARM: OMAP2+: Fix selection of clockevent timer when using device-tree
ARM: OMAP: Fix the use of uninitialized dma_lch_count
ARM: OMAP: make wakeupgen_lock raw
+ Linux 3.8-rc6
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,8 +1,8 @@ VERSION = 3 PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = -rc5 -NAME = Terrified Chipmunk +EXTRAVERSION = -rc6 +NAME = Unicycling Gorilla # *DOCUMENTATION* # To see a list of typical targets execute "make help" |