Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge

This commit is contained in:
Linus Torvalds
2005-11-04 16:27:50 -08:00
177 changed files with 8645 additions and 4019 deletions
+4 -4
View File
@@ -72,12 +72,12 @@
#include <linux/ethtool.h>
#include <asm/abs_addr.h>
#include <asm/iSeries/mf.h>
#include <asm/iseries/mf.h>
#include <asm/uaccess.h>
#include <asm/iSeries/HvLpConfig.h>
#include <asm/iSeries/HvTypes.h>
#include <asm/iSeries/HvLpEvent.h>
#include <asm/iseries/hv_lp_config.h>
#include <asm/iseries/hv_types.h>
#include <asm/iseries/hv_lp_event.h>
#include <asm/iommu.h>
#include <asm/vio.h>