diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-23 15:40:58 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-23 15:40:58 -0700 | 
| commit | 56bae802681116dc279c40218b146b5a0c553a3b (patch) | |
| tree | ef7a993411e75bff9e136ff7e65262f5ccba6bf2 /lib/timerqueue.c | |
| parent | 0737c8d7aedfe590010e38c3e3bbdc87affa8c3d (diff) | |
| parent | 24cc7fb69a5b5edfdff1d38c6a213d6a33648829 (diff) | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild fixes from Michal Marek:
 "There are two more kbuild fixes for 3.6.
  One fixes a race between x86's archscripts target and the rule
  (re)building scripts/basic/fixdep.  The second is a fix for the
  previous attempt at fixing make firmware_install with make 3.82.
  This new solution should work with any version of GNU make"
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  x86/kbuild: archscripts depends on scripts_basic
  firmware: fix directory creation rule matching with make 3.80
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions
