diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 16:38:25 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-06 16:38:25 (GMT) |
| commit | bd12ce8cc23a5ab7eafb1edb3f2cd311d2b89e7e (patch) | |
| tree | f6b9179b98d9a9584b42a8e3c4f363607e508c21 /fs/jbd/journal.c | |
| parent | 80de7c3138ee9fd86a98696fd2cf7ad89b995d0a (diff) | |
| parent | 6c7080a61fc7b46b3ac8573952b5a3e9d5f68bc4 (diff) | |
| download | linux-bd12ce8cc23a5ab7eafb1edb3f2cd311d2b89e7e.tar.xz | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fixes from Michal Marek:
"These are two fixes that should go into 3.6. The link-vmlinux.sh one
is obvious.
The other one fixes make firmware_install with certain configurations,
where a file in the toplevel firmware tree gets installed first, and
$(INSTALL_FW_PATH)/$$(dir <file>) results in /lib/firmware/./, which
confuses make 3.82 for some reason."
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
firmware: fix directory creation rule matching with make 3.82
link-vmlinux.sh: Fix stray "echo" in error message
Diffstat (limited to 'fs/jbd/journal.c')
0 files changed, 0 insertions, 0 deletions