summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-15 11:25:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-15 11:25:41 -0800
commita520458fccc5f5dd4d0ed63c0602db2fd3172b21 (patch)
tree3bca2be919eac0bfb50bd0623cda6df589260de8 /arch/x86/kernel
parentc49c41a4134679cecb77362e7f6b59acb6320aa7 (diff)
parent1f4f43475f1295dc41c18684e59deea9b6d46045 (diff)
downloadlinux-a520458fccc5f5dd4d0ed63c0602db2fd3172b21.tar.bz2
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6: UBI: use own macros for the layout volume UBI: fix nameless volumes handling UBIFS: fix non-debug configuration build
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions