diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 19:47:42 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-23 19:47:42 -0300 |
commit | c4cc142235d7d77327c2a53d9efb2750b1ec80bf (patch) | |
tree | 41446fa0833a3783d24b6bd12c64336f845e6032 /kernels/linux-libre-xen/config.i686 | |
parent | 5ddafb1e55d18275d3f16e9faa3e9da788b54389 (diff) | |
parent | b1b9debcc7f6756d83dbac37806021de007cf083 (diff) |
Merge branch 'master' of ssh://gparabola/abslibre
Conflicts:
libre/linux-libre/PKGBUILD
Diffstat (limited to 'kernels/linux-libre-xen/config.i686')
-rw-r--r-- | kernels/linux-libre-xen/config.i686 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index 0e11985ee..c901ed38d 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.7-libre Kernel Configuration +# Linux/i386 3.2.9-libre Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y |