diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-27 14:39:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-27 14:39:23 +1000 |
| commit | 60322f950c1e1f99ce75f609729c0d2e075711df (patch) | |
| tree | b5521307a0e05bdf13faf6d4fd946a9daa9c2533 /lib/smp_processor_id.c | |
| parent | f57976520eb34962ee6fe36c0215ce4fb9dace2e (diff) | |
| parent | a751eae15f74649760465891f9878fa5e6a73d53 (diff) | |
Merge remote branch 'tip/auto-latest'
Conflicts:
include/linux/percpu.h
net/core/dev.c
Diffstat (limited to 'lib/smp_processor_id.c')
0 files changed, 0 insertions, 0 deletions