diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 10:58:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-17 10:58:44 -0800 |
| commit | af575e2d2e09517a8190f1b425453cc3e0102f6c (patch) | |
| tree | 4be2556d0bb6d756a62b2682df3d3c648e4a77a6 /drivers/staging/smbfs/dir.c | |
| parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| parent | alpha: fix WARN_ON in __local_bh_enable() (diff) | |
| download | linux-dev-af575e2d2e09517a8190f1b425453cc3e0102f6c.tar.xz linux-dev-af575e2d2e09517a8190f1b425453cc3e0102f6c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: fix WARN_ON in __local_bh_enable()
alpha: fix breakage caused by df9ee29270
alpha: add GENERIC_HARDIRQS_NO__DO_IRQ to Kconfig
alpha/osf_sys: remove unused MAX_SELECT_SECONDS
alpha: change to new Makefile flag variables
alpha: kill off alpha_do_IRQ
alpha: irq clean up
alpha: use set_irq_chip and push down __do_IRQ to the machine types
Diffstat (limited to 'drivers/staging/smbfs/dir.c')
0 files changed, 0 insertions, 0 deletions