diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:33:25 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-09-03 21:59:03 +0200 |
| commit | 32a0454d3c495b12824ef4a0d0341237302d148a (patch) | |
| tree | 9acc870d089b0028cecdfb1846b828ae4bd38910 /linux | |
| parent | f9686563b4fd3eed22e26105f7c440f0b74fcac1 (diff) | |
| parent | dafa32b3bd75e9d155d075c796fa5b0ecbb9b11b (diff) | |
| download | buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.tar.gz buildroot-novena-32a0454d3c495b12824ef4a0d0341237302d148a.zip | |
Merge branch 'next'
Conflicts:
package/e2fsprogs/e2fsprogs.mk
package/libfuse/libfuse.mk
package/multimedia/mpd/mpd.mk
package/smartmontools/smartmontools.mk
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Config.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/Config.in b/linux/Config.in index 9c63215c1..030634853 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -22,7 +22,7 @@ choice default BR2_LINUX_KERNEL_3_4 config BR2_LINUX_KERNEL_3_4 - bool "3.4.7" + bool "3.4.8" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -77,7 +77,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION config BR2_LINUX_KERNEL_VERSION string - default "3.4.7" if BR2_LINUX_KERNEL_3_4 + default "3.4.8" if BR2_LINUX_KERNEL_3_4 default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL |