Merge remote-tracking branch 'origin/master' into elflinksyslinux-5.00-pre3
commitc64fb805ca8bdcc96528f55ef28dcb0cd5c39c20
authorH. Peter Anvin <hpa@zytor.com>
Wed, 13 Jun 2012 02:49:19 +0000 (12 19:49 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 13 Jun 2012 02:49:19 +0000 (12 19:49 -0700)
treea3939845d967199a6e9f7482b5646791f76f1b71
parente7bd19def830e8341b1a100956345f1028740b9e
parent753ab4bde224205876f09889ce928acb3682ba73
Merge remote-tracking branch 'origin/master' into elflink
com32/modules/linux.c
core/fs/btrfs/btrfs.c