Skip to content

Commit

Permalink
Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/kernel/git/aegl/linux

Pull ia64 fix from Tony Luck:
 "Unbreak ia64 build by avoiding circular dependency"

* tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  kernel/bounds: avoid circular dependencies in generated headers
  • Loading branch information
Linus Torvalds committed Nov 19, 2013
2 parents dec8e46 + 24b9fdc commit e87e7be
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/bounds.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <linux/kbuild.h>
#include <linux/page_cgroup.h>
#include <linux/log2.h>
#include <linux/spinlock.h>
#include <linux/spinlock_types.h>

void foo(void)
{
Expand Down

0 comments on commit e87e7be

Please sign in to comment.