diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-15 23:15:16 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-15 23:15:16 +0300 |
commit | 5274f8354d6a1ed9d6688e6a89b705b94aa1b6e9 (patch) | |
tree | a40ae6f754648311b27811acbbd7af61cc65eab0 /drivers/net/bnx2.h | |
parent | ad0b0fd554dfc126b5750d14908dccc3bbf602be (diff) | |
parent | a0490fa35dc0022ef95f64802e8edf18c411c790 (diff) | |
parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
download | linux-5274f8354d6a1ed9d6688e6a89b705b94aa1b6e9.tar.xz |
Merge branch 'sched/urgent'; commit 'v2.6.29-rc5' into sched/core