Skip to content

Commit

Permalink
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/ke…
Browse files Browse the repository at this point in the history 
…rnel/git/rostedt/linux-trace into perf/core
  • Loading branch information
Ingo Molnar committed Oct 18, 2011
2 parents ee8f967 + abcefec commit 47724df
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/m32r/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ config M32R
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
select GENERIC_ATOMIC64

config SBUS
bool
Expand Down

0 comments on commit 47724df

Please sign in to comment.